[Bug 4389] New: handle merge in `hg evolve`
mercurial-bugs at selenic.com
mercurial-bugs at selenic.com
Sat Sep 27 16:50:53 CDT 2014
http://bz.selenic.com/show_bug.cgi?id=4389
Priority: normal
Bug ID: 4389
CC: mercurial-devel at selenic.com
Assignee: bugzilla at selenic.com
Summary: handle merge in `hg evolve`
Severity: bug
Classification: Unclassified
OS: All
Reporter: pierre-yves.david at ens-lyon.org
Hardware: All
Status: UNCONFIRMED
Version: unspecified
Component: evolution
Product: Mercurial
Merge are a bit more complicated to evolve, because we may needs to merge with
both the p1 successors and the p2 successors.
We should first unlock the evolution of merge where only one of the parents is
obsolete. Then we can handle any kind of merge by doing the evolution in two
steps. (one for p1, one for p2)
--
You are receiving this mail because:
You are on the CC list for the bug.
More information about the Mercurial-devel
mailing list