Parallel merging/per-file merging

Dmitry Nezhevenko dion at inhex.net
Tue Jun 22 10:10:24 UTC 2010


Hi,

Imagine that you have some repository that contains two long-term feature
branches that were not merged for a long time. And now it's time to merge
them together. A lot of files were changed in both branches.

Is it any way to parallel such operation so that two/three/more developers
will do a partial merge/review on their own machines an then share results. For
example first dev may choose one directory while second will merge
another.

I understand that Mercurial uses "changeset" and not "per-file" merge. But
is it any way to break the rule?

-- 
WBR, Dmitry
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 835 bytes
Desc: Digital signature
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20100622/0597a3d6/attachment.asc>


More information about the Mercurial mailing list