Fred Drake wrote:
On Dec 5, 2008, at 2:20 PM, Mark Dickinson wrote:
Did I mess up somewhere, or does svnmerge not work on a revision that was itself the result of an svnmerge?
I ran into this yesterday as well with my patch to the cgi module. The work-around was to revert the change to that property and edit it manually.
I think this is a significant issue, since editing that property is about as error-prone as it can be. I've not really looked at the code in svnmerge.py, so I'm not sure how hard it would be to fix.
I think we're discovering the real reasons why people generally prefer to use a DVCS when trying to manage multiple branches :P For now it looks like we might have to maintain 3.0 manually, with svnmerge only helping out for trunk->2.6 and trunk->py3k... Cheers, Nick. -- Nick Coghlan | ncoghlan@gmail.com | Brisbane, Australia ---------------------------------------------------------------