http://www.microshell.com/programming/general-algorithm/introduction-to-merging-with-svn/ Learn something share something Fri, 16 Jul 2010 20:06:22 -0700 http://wordpress.org/?v=2.8.1 hourly 1 http://www.microshell.com/programming/general-algorithm/introduction-to-merging-with-svn/comment-page-1/#comment-1933 Maresa Fri, 18 Dec 2009 19:38:06 +0000 http://www.microshell.com/?p=879#comment-1933 Yes ... SVN 1.6.x does support merging .. hence we don't have to use svnmerge.py anymore. There are plenty of cases where distributions doesn't have SVN 1.6 yet. In particular Ubuntu Hardy (the distribution I'm using). Even if you're using SVN 1.6, it doesn't mean that you can't still use svnmerge.py though. I have a feeling that I would still be using svnmerge.py even though I'm using SVN 1.6 just because I'm already familiar with it. Maybe once svnmerge.py is no longer maintained, I'd be forced to use SVN 1.6 built in merging feature :-) Yes … SVN 1.6.x does support merging .. hence we don’t have to use svnmerge.py anymore. There are plenty of cases where distributions doesn’t have SVN 1.6 yet. In particular Ubuntu Hardy (the distribution I’m using). Even if you’re using SVN 1.6, it doesn’t mean that you can’t still use svnmerge.py though. I have a feeling that I would still be using svnmerge.py even though I’m using SVN 1.6 just because I’m already familiar with it. Maybe once svnmerge.py is no longer maintained, I’d be forced to use SVN 1.6 built in merging feature

]]> http://www.microshell.com/programming/general-algorithm/introduction-to-merging-with-svn/comment-page-1/#comment-1927 Gabriele Vivinetto Fri, 18 Dec 2009 13:08:00 +0000 http://www.microshell.com/?p=879#comment-1927 I think this is not needed woth svn 1.6.x, because it saves merge history in the svn:property mergeinfo. Am I wrong ? I think this is not needed woth svn 1.6.x, because it saves merge history in the svn:property mergeinfo.
Am I wrong ?

]]>