-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Benjamin Peterson wrote: > 2009/7/2 Jeroen Ruigrok van der Werven <asmo...@in-nomine.org>: >> -On [20090702 17:15], Jesus Cea (j...@jcea.es) wrote: >>> Ughhh. This is actually a good reason to migrate to mercurial, were >>> merges are painless :-). >> For all I know Mercurial doesn't make the issue of resolving content merges >> easier, so that would make your comment moot. > > They're about 2^987987979 times faster, though than with svnmerge.py.
And you don't forget any merge, because you commit to the maintenance and then merge to the trunk. - -- Jesus Cea Avion _/_/ _/_/_/ _/_/_/ j...@jcea.es - http://www.jcea.es/ _/_/ _/_/ _/_/ _/_/ _/_/ jabber / xmpp:j...@jabber.org _/_/ _/_/ _/_/_/_/_/ . _/_/ _/_/ _/_/ _/_/ _/_/ "Things are not so easy" _/_/ _/_/ _/_/ _/_/ _/_/ _/_/ "My name is Dump, Core Dump" _/_/_/ _/_/_/ _/_/ _/_/ "El amor es poner tu felicidad en la felicidad de otro" - Leibniz -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.8 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iQCVAwUBSkzVBJlgi5GaxT1NAQLXrQP/atOdGpe5bidVWexezSOQAq9Zzkgf8pd6 4lDzQqxvDF8K2TeMNT7s4EXib0OQGLxP/jjtp+Tupb/e0oMu8t9wFNrdhJsatNyR SCyLlfvk/lr5aAFeFGwwZOkMcudqfhPXbq3CEmz3g0dchnITqEqSN1xv2K6YUZJe qdIoBOCUt4U= =OYEB -----END PGP SIGNATURE----- _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers