-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 22/03/11 11:19, John Arbash Meinel wrote: > And suddenly the revision which was an "important" C change is now gone > on the mainline, and your personal "and I did D" is now a primary > revision. It doesn't matter much for a single revision D and C, but for > anything long lived, you end up with 100 Guido exploratory D revisions, > and some 50+ other python-dev super-stable trunk C revisions. And unless > the tool helps you preserve the ordering[3], you really don't want to > trying to treat them with different levels of authority. Hence, you tend > to collapse, because you really can only trust "E" to be a final stable > change.
Mercurial merge has a "left" and "right" parents concept. Some commands only follow the "left" side. For instance, "hg log --follow-first". We could have a trivial "push hook" to enforce that the current tip be the "left/first" parent for any merge. - -- 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/ iQCVAwUBTYjroJlgi5GaxT1NAQKWewP9GjCnnZhmwRXw+fQX7n9YpTXeE2y2fw6M lPHkw3EFezYRZCyBE1GEM2pnMboJfoh/SxTRaPP68Tp8sAJ0A/5sN1Xh+hDax2wm 6oSOo6lbtDaEJHNpIZpeEu4Z5Axh9mn851atMvI1iImb1UCAsANsZ7AyNqPZVkxo EbDa34Ppv2w= =lYXJ -----END PGP SIGNATURE----- _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
