ancestor: rewrite to deal with crossed linkrevs (
issue2682)
This version is about 10% slower, possibly because it visits some
revisions in a different topological order than what's in the revlog.
merge: back out single-parent fast-forward merge
This backs out
changeset: 13158:
9e7e24052745
user: Mads Kiilerich <mads@kiilerich.com>
date: Tue Dec 07 03:29:21 2010 +0100
summary: merge: fast-forward merge with descendant
Before named branches, the invariants were:
a) "merges" always have two parents
b) p1 is not linearly related to p2
Adding named branches made (b) problematic, so the above patch was
introduced, which fixed (b) but broke (a).
After discussion, we decided that the invariants should be:
a) "merges" always have two parents
b) p1 is not linearly related to p2 OR p1 and p2 are on different branches
merge: drop resolve state for mergers with identical contents (
issue2680)