-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 04/02/11 16:49, Nick Coghlan wrote: > On the other hand, if *any* forward port naturally picks up all the > missed forward ports, then the Mercurial perspective starts to make > more sense (especially if the merge is able to exploit the DAG in > order to make fewer mistakes).
A mercurial merge "brings" "automatically" (if can be done) any patch in a side, to the other side. Basically "joins" the two sides making a single one. clone 1: A->B->C->D Clone 2: A->E->F->G->H When you merge you have: A->B->C->D--------->I \ / \->E->F->G->H-/ Code in "I" contains all "B", "C", "D", "E", "F", "G" and "H". This merging is "automatic" (if there are no conflicts!). That is the magic in Mercurial. The merge machinery. It is a huge improvement over subversion, even in 1.6.*. - -- 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.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/ iQCVAwUBTUw/eZlgi5GaxT1NAQJjdwP/dF6H2K9sdOUrXJ9jwJxwwgZzrGDQfM0p OG1sKTUCnn7WKC0II2Ep56BdVMC7HvF5PT9fQDOMKwyDz2WN02YgTIxvrHwh4wHz 90zXvDB7VslH5k1shXm7v++mqgutWDMOUHRJ73ZjKuS6rSnf69m4yCN7PK0stGcX 1uHaPiMJI+8= =p9Zg -----END PGP SIGNATURE----- _______________________________________________ python-committers mailing list python-committers@python.org http://mail.python.org/mailman/listinfo/python-committers
