2010年12月29日 Georg Brandl <[email protected]>: >>> A change can of course also be transplanted after the fact. It requires >>> another >>> merge, but usually a trivial one. >> >> No, it's not trivial with hg: this is the very subject of the thread! > > I don't understand: if you make the same change in two branches, but > in different changesets, and then merge these branches, Mercurial will > usually notice that and not trouble you with conflicts.
Actually I never passed the first step: make the same change to two branches. -- Amaury Forgeot d'Arc _______________________________________________ Python-Dev mailing list [email protected] http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com