Marc Delisle wrote:
Michal Čihař a écrit :
Hi all
while merging GSoC branches, I really understood how painful are branches in SVN. I use Git for most other projects and such thing is much easier there as well as it adds some other benefits (eg. possibility to work offline).
About Subversion 1.6 branching and merging: http://www.phpcult.com/blog/2009/08/subversion-1-6-branching-and-merging-cav...
I'm sort-off back... but still catching up on some reading.
As the link above points out it has become a bit easier to do merging in svn 'recently'. A while back when I was experimenting with git I noticed that svn now stores a property to keep track of which trunk changes have already been merged into your branch. After bringing your branch into sync, which is not limited to a single time, merging into trunk should be straightforward.
My point being: The tools are more important then the architecture.
Sure git has some very nice advantages, mainly being less reliant on the 'slow' sf.net svn server. But many users have svn experience and speaking for myself limited git experience.
Either way is fine by me, I don't mind reading up on git.