Well, the last time I had to know, ASF SVN was not 1.6, and the only merge technology was svnmerge.py, and make sure there's no Chinese in your log comments :-)
It works. It doesn't work nearly so well as git for merging. CXF developers routinely use git-svn for feature branches. For all I know, ASF svn has since caught up. However, at the day job, the word is that 1.6 has partially broken svnmerge.py without completely replacing it. I have a lot of sympathy for people who want to model ASF development as 'SVN with offline branches and really good merging.' Incubator-wise, I think we may run into more and more communities who have perfectly reasonably community development models (one core trunk in one place) while at the same time having an established development process that uses GIT as a tool. We should be careful not to tar them with the 'many conflicting repositories' brush undeservedly. Hopefully an ASF ability to support this mode of operation will happen at some point -- in the mean time, it's git svn for the podlings just like it is for the projects. On Fri, Oct 1, 2010 at 6:00 PM, Mark Struberg <strub...@yahoo.de> wrote: > It seems that with 1.6 SVN did learn a bit about the 'git way' (apologize if > it was even earlier and has nothing to do with git). SVN now applies merges > bit by bit it seems (tested with 1.6.9). But I still have problems with > intermediately merged projects (merging the trunk into my branch ~ every 2nd > day). Somehow I ended up having the same pieces in my branch and in my trunk, > but both got marked as conflict. > > Anyway, SVN is the way to go for now. > > LieGrue, > strub > > --- On Fri, 10/1/10, Jochen Wiedmann <jochen.wiedm...@gmail.com> wrote: > >> From: Jochen Wiedmann <jochen.wiedm...@gmail.com> >> Subject: Re: Podling to use native git >> To: general@incubator.apache.org >> Date: Friday, October 1, 2010, 9:48 PM >> On Fri, Oct 1, 2010 at 11:44 PM, Greg >> Stein <gst...@gmail.com> >> wrote: >> >> > I do branches all the time in Subversion, and don't >> see problems. We >> > periodically update the branch from trunk, and when >> the work is done, >> > merge the branch back onto trunk. These are >> straight-forward >> > operations, so I don't understand where your pain >> point is. >> > >> > If you could explain a bit, then that would be >> helpful. >> >> Just out of curiosity: If you pull in changes from the >> trunk to the >> branch, how do you merge the branch later on? I'd consider >> the changes >> a problem that have been done in both branches. (Unlike >> git, which >> "knows" about these simultaneous changes.) >> >> Thanks, >> >> Jochen >> >> -- >> I Am What I Am And That's All What I Yam (Popeye) >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org >> For additional commands, e-mail: general-h...@incubator.apache.org >> >> > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org > For additional commands, e-mail: general-h...@incubator.apache.org > > --------------------------------------------------------------------- To unsubscribe, e-mail: general-unsubscr...@incubator.apache.org For additional commands, e-mail: general-h...@incubator.apache.org
