Comments on: svn merging is full of fail http://boredzo.org/blog/archives/2008-08-07/svn-merging-is-full-of-fail The personal weblog of Peter Hosey. Fri, 09 Jan 2009 01:07:36 +0000 http://wordpress.org/?v=2.6.5 By: Pierre Phaneuf http://boredzo.org/blog/archives/2008-08-07/svn-merging-is-full-of-fail#comment-238497 Pierre Phaneuf Wed, 07 Jan 2009 17:52:25 +0000 http://boredzo.org/blog/?p=686#comment-238497 Whew, I really like svnmerge.py! ;-) Whew, I really like svnmerge.py! ;-)

]]> By: Peter Hosey http://boredzo.org/blog/archives/2008-08-07/svn-merging-is-full-of-fail#comment-216472 Peter Hosey Fri, 08 Aug 2008 00:17:52 +0000 http://boredzo.org/blog/?p=686#comment-216472 Joachim: Because I had bulldozed MSN.AdiumEmoticonSet, then re-upped it. I had expected it to be unmodified (and unmerged), so I ran another merge to try to re-apply the merge to it. I wasn't expecting the merge to already be applied. Joachim: Because I had bulldozed MSN.AdiumEmoticonSet, then re-upped it. I had expected it to be unmodified (and unmerged), so I ran another merge to try to re-apply the merge to it. I wasn't expecting the merge to already be applied.

]]> By: Joachim Bengtsson http://boredzo.org/blog/archives/2008-08-07/svn-merging-is-full-of-fail#comment-216448 Joachim Bengtsson Thu, 07 Aug 2008 21:05:07 +0000 http://boredzo.org/blog/?p=686#comment-216448 If I followed you correctly there, you did a merge, up, and then merge again, on the same wc. Why'd you do the second merge? You had already merged the changes from trunk... Also, when you find that stuff's completely messed up, it's easier to just remove all of it and do it over, instead of trying to commit... After all those errors, I wouldn\'t have trusted svn to have preserved all changes, something must've been lost. If I followed you correctly there, you did a merge, up, and then merge again, on the same wc. Why'd you do the second merge? You had already merged the changes from trunk...

Also, when you find that stuff's completely messed up, it's easier to just remove all of it and do it over, instead of trying to commit... After all those errors, I wouldn\'t have trusted svn to have preserved all changes, something must've been lost.

]]>