Home Original page

[python-committers] svnmerge

Christian Heimes lists at cheimes.de
Wed Mar 4 12:27:53 CET 2009 
Antoine Pitrou schrieb:
> Le dimanche 01 mars 2009 à 21:08 +0100, "Martin v. Löwis" a écrit :
>> I meant that as a relative qualification indeed (merging a single
>> revision specified on the command line as opposed to merging all
>> available versions).
>>
>> I just measured merging r70081, and it took 42s.
> 
> After the merge from io-c to py3k, where svnmerge seems to have
> "forgotten" a couple of changes which I have had to fix manually, I want
> to say that svnmerge has more than simply performance issues... ;-)

I ran into similar trouble during the merge of the long running math
branch. After two failed attempts I decided to merge the changes
manually. I couldn't figure out why svnmerge was failing because I
hadn't had enough spare time.

Christian
More information about the python-committers mailing list