mergecopies: invoke _computenonoverlap for both base and tca during merges

The algorithm of _checkcopies can only walk backwards in the DAG, never
forward. Because of this, the two _checkcopies patches need to run from
their respective endpoints to the TCA to cover the entire subgraph where
the merge is being performed. However, detection of files new in both
endpoints, as well as directory rename detection, need to run with respect
to the merge base, so we need lists of new files both from the TCA's and
the merge base's viewpoint to correctly detect renames in a graft-like
merge scenario.

(Series reworked by Pierre-Yves David)

mercurial/copies.py

@@ -1,618 +1,630
 # copies.py - copy detection for Mercurial
 #
 # Copyright 2008 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 from __future__ import absolute_import
 
 import heapq
 
 from . import (
     node,
     pathutil,
     scmutil,
     util,
 )
 
 def _findlimit(repo, a, b):
     """
     Find the last revision that needs to be checked to ensure that a full
     transitive closure for file copies can be properly calculated.
     Generally, this means finding the earliest revision number that's an
     ancestor of a or b but not both, except when a or b is a direct descendent
     of the other, in which case we can return the minimum revnum of a and b.
     None if no such revision exists.
     """
 
     # basic idea:
     # - mark a and b with different sides
     # - if a parent's children are all on the same side, the parent is
     #   on that side, otherwise it is on no side
     # - walk the graph in topological order with the help of a heap;
     #   - add unseen parents to side map
     #   - clear side of any parent that has children on different sides
     #   - track number of interesting revs that might still be on a side
     #   - track the lowest interesting rev seen
     #   - quit when interesting revs is zero
 
     cl = repo.changelog
     working = len(cl) # pseudo rev for the working directory
     if a is None:
         a = working
     if b is None:
         b = working
 
     side = {a: -1, b: 1}
     visit = [-a, -b]
     heapq.heapify(visit)
     interesting = len(visit)
     hascommonancestor = False
     limit = working
 
     while interesting:
         r = -heapq.heappop(visit)
         if r == working:
             parents = [cl.rev(p) for p in repo.dirstate.parents()]
         else:
             parents = cl.parentrevs(r)
         for p in parents:
             if p < 0:
                 continue
             if p not in side:
                 # first time we see p; add it to visit
                 side[p] = side[r]
                 if side[p]:
                     interesting += 1
                 heapq.heappush(visit, -p)
             elif side[p] and side[p] != side[r]:
                 # p was interesting but now we know better
                 side[p] = 0
                 interesting -= 1
                 hascommonancestor = True
         if side[r]:
             limit = r # lowest rev visited
             interesting -= 1
 
     if not hascommonancestor:
         return None
 
     # Consider the following flow (see test-commit-amend.t under issue4405):
     # 1/ File 'a0' committed
     # 2/ File renamed from 'a0' to 'a1' in a new commit (call it 'a1')
     # 3/ Move back to first commit
     # 4/ Create a new commit via revert to contents of 'a1' (call it 'a1-amend')
     # 5/ Rename file from 'a1' to 'a2' and commit --amend 'a1-msg'
     #
     # During the amend in step five, we will be in this state:
     #
     # @  3 temporary amend commit for a1-amend
     # |
     # o  2 a1-amend
     # |
     # | o  1 a1
     # |/
     # o  0 a0
     #
     # When _findlimit is called, a and b are revs 3 and 0, so limit will be 2,
     # yet the filelog has the copy information in rev 1 and we will not look
     # back far enough unless we also look at the a and b as candidates.
     # This only occurs when a is a descendent of b or visa-versa.
     return min(limit, a, b)
 
 def _chain(src, dst, a, b):
     '''chain two sets of copies a->b'''
     t = a.copy()
     for k, v in b.iteritems():
         if v in t:
             # found a chain
             if t[v] != k:
                 # file wasn't renamed back to itself
                 t[k] = t[v]
             if v not in dst:
                 # chain was a rename, not a copy
                 del t[v]
         if v in src:
             # file is a copy of an existing file
             t[k] = v
 
     # remove criss-crossed copies
     for k, v in t.items():
         if k in src and v in dst:
             del t[k]
 
     return t
 
 def _tracefile(fctx, am, limit=-1):
     '''return file context that is the ancestor of fctx present in ancestor
     manifest am, stopping after the first ancestor lower than limit'''
 
     for f in fctx.ancestors():
         if am.get(f.path(), None) == f.filenode():
             return f
         if limit >= 0 and f.linkrev() < limit and f.rev() < limit:
             return None
 
 def _dirstatecopies(d):
     ds = d._repo.dirstate
     c = ds.copies().copy()
     for k in c.keys():
         if ds[k] not in 'anm':
             del c[k]
     return c
 
 def _computeforwardmissing(a, b, match=None):
     """Computes which files are in b but not a.
     This is its own function so extensions can easily wrap this call to see what
     files _forwardcopies is about to process.
     """
     ma = a.manifest()
     mb = b.manifest()
     if match:
         ma = ma.matches(match)
         mb = mb.matches(match)
     return mb.filesnotin(ma)
 
 def _forwardcopies(a, b, match=None):
     '''find {dst@b: src@a} copy mapping where a is an ancestor of b'''
 
     # check for working copy
     w = None
     if b.rev() is None:
         w = b
         b = w.p1()
         if a == b:
             # short-circuit to avoid issues with merge states
             return _dirstatecopies(w)
 
     # files might have to be traced back to the fctx parent of the last
     # one-side-only changeset, but not further back than that
     limit = _findlimit(a._repo, a.rev(), b.rev())
     if limit is None:
         limit = -1
     am = a.manifest()
 
     # find where new files came from
     # we currently don't try to find where old files went, too expensive
     # this means we can miss a case like 'hg rm b; hg cp a b'
     cm = {}
 
     # Computing the forward missing is quite expensive on large manifests, since
     # it compares the entire manifests. We can optimize it in the common use
     # case of computing what copies are in a commit versus its parent (like
     # during a rebase or histedit). Note, we exclude merge commits from this
     # optimization, since the ctx.files() for a merge commit is not correct for
     # this comparison.
     forwardmissingmatch = match
     if not match and b.p1() == a and b.p2().node() == node.nullid:
         forwardmissingmatch = scmutil.matchfiles(a._repo, b.files())
     missing = _computeforwardmissing(a, b, match=forwardmissingmatch)
 
     ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True)
     for f in missing:
         fctx = b[f]
         fctx._ancestrycontext = ancestrycontext
         ofctx = _tracefile(fctx, am, limit)
         if ofctx:
             cm[f] = ofctx.path()
 
     # combine copies from dirstate if necessary
     if w is not None:
         cm = _chain(a, w, cm, _dirstatecopies(w))
 
     return cm
 
 def _backwardrenames(a, b):
     if a._repo.ui.configbool('experimental', 'disablecopytrace'):
         return {}
 
     # Even though we're not taking copies into account, 1:n rename situations
     # can still exist (e.g. hg cp a b; hg mv a c). In those cases we
     # arbitrarily pick one of the renames.
     f = _forwardcopies(b, a)
     r = {}
     for k, v in sorted(f.iteritems()):
         # remove copies
         if v in a:
             continue
         r[v] = k
     return r
 
 def pathcopies(x, y, match=None):
     '''find {dst@y: src@x} copy mapping for directed compare'''
     if x == y or not x or not y:
         return {}
     a = y.ancestor(x)
     if a == x:
         return _forwardcopies(x, y, match=match)
     if a == y:
         return _backwardrenames(x, y)
     return _chain(x, y, _backwardrenames(x, a),
                   _forwardcopies(a, y, match=match))
 
 def _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, baselabel=''):
     """Computes, based on addedinm1 and addedinm2, the files exclusive to c1
     and c2. This is its own function so extensions can easily wrap this call
     to see what files mergecopies is about to process.
 
     Even though c1 and c2 are not used in this function, they are useful in
     other extensions for being able to read the file nodes of the changed files.
 
     "baselabel" can be passed to help distinguish the multiple computations
     done in the graft case.
     """
     u1 = sorted(addedinm1 - addedinm2)
     u2 = sorted(addedinm2 - addedinm1)
 
     header = "  unmatched files in %s"
     if baselabel:
         header += ' (from %s)' % baselabel
     if u1:
         repo.ui.debug("%s:\n   %s\n" % (header % 'local', "\n   ".join(u1)))
     if u2:
         repo.ui.debug("%s:\n   %s\n" % (header % 'other', "\n   ".join(u2)))
     return u1, u2
 
 def _makegetfctx(ctx):
     """return a 'getfctx' function suitable for _checkcopies usage
 
     We have to re-setup the function building 'filectx' for each
     '_checkcopies' to ensure the linkrev adjustment is properly setup for
     each. Linkrev adjustment is important to avoid bug in rename
     detection. Moreover, having a proper '_ancestrycontext' setup ensures
     the performance impact of this adjustment is kept limited. Without it,
     each file could do a full dag traversal making the time complexity of
     the operation explode (see issue4537).
 
     This function exists here mostly to limit the impact on stable. Feel
     free to refactor on default.
     """
     rev = ctx.rev()
     repo = ctx._repo
     ac = getattr(ctx, '_ancestrycontext', None)
     if ac is None:
         revs = [rev]
         if rev is None:
             revs = [p.rev() for p in ctx.parents()]
         ac = repo.changelog.ancestors(revs, inclusive=True)
         ctx._ancestrycontext = ac
     def makectx(f, n):
         if len(n) != 20:  # in a working context?
             if ctx.rev() is None:
                 return ctx.filectx(f)
             return repo[None][f]
         fctx = repo.filectx(f, fileid=n)
         # setup only needed for filectx not create from a changectx
         fctx._ancestrycontext = ac
         fctx._descendantrev = rev
         return fctx
     return util.lrucachefunc(makectx)
 
 def mergecopies(repo, c1, c2, base):
     """
     Find moves and copies between context c1 and c2 that are relevant
     for merging. 'base' will be used as the merge base.
 
     Returns four dicts: "copy", "movewithdir", "diverge", and
     "renamedelete".
 
     "copy" is a mapping from destination name -> source name,
     where source is in c1 and destination is in c2 or vice-versa.
 
     "movewithdir" is a mapping from source name -> destination name,
     where the file at source present in one context but not the other
     needs to be moved to destination by the merge process, because the
     other context moved the directory it is in.
 
     "diverge" is a mapping of source name -> list of destination names
     for divergent renames.
 
     "renamedelete" is a mapping of source name -> list of destination
     names for files deleted in c1 that were renamed in c2 or vice-versa.
     """
     # avoid silly behavior for update from empty dir
     if not c1 or not c2 or c1 == c2:
         return {}, {}, {}, {}
 
     # avoid silly behavior for parent -> working dir
     if c2.node() is None and c1.node() == repo.dirstate.p1():
         return repo.dirstate.copies(), {}, {}, {}
 
     # Copy trace disabling is explicitly below the node == p1 logic above
     # because the logic above is required for a simple copy to be kept across a
     # rebase.
     if repo.ui.configbool('experimental', 'disablecopytrace'):
         return {}, {}, {}, {}
 
     # In certain scenarios (e.g. graft, update or rebase), base can be
     # overridden We still need to know a real common ancestor in this case We
     # can't just compute _c1.ancestor(_c2) and compare it to ca, because there
     # can be multiple common ancestors, e.g. in case of bidmerge.  Because our
     # caller may not know if the revision passed in lieu of the CA is a genuine
     # common ancestor or not without explicitly checking it, it's better to
     # determine that here.
     #
     # base.descendant(wc) and base.descendant(base) are False, work around that
     _c1 = c1.p1() if c1.rev() is None else c1
     _c2 = c2.p1() if c2.rev() is None else c2
     # an endpoint is "dirty" if it isn't a descendant of the merge base
     # if we have a dirty endpoint, we need to trigger graft logic, and also
     # keep track of which endpoint is dirty
     dirtyc1 = not (base == _c1 or base.descendant(_c1))
     dirtyc2 = not (base== _c2 or base.descendant(_c2))
     graft = dirtyc1 or dirtyc2
     tca = base
     if graft:
         tca = _c1.ancestor(_c2)
 
     limit = _findlimit(repo, c1.rev(), c2.rev())
     if limit is None:
         # no common ancestor, no copies
         return {}, {}, {}, {}
     repo.ui.debug("  searching for copies back to rev %d\n" % limit)
 
     m1 = c1.manifest()
     m2 = c2.manifest()
     mb = base.manifest()
 
     # gather data from _checkcopies:
     # - diverge = record all diverges in this dict
     # - copy = record all non-divergent copies in this dict
     # - fullcopy = record all copies in this dict
     diverge = {} # divergence data is shared
     data1 = {'copy': {},
              'fullcopy': {},
              'diverge': diverge,
             }
     data2 = {'copy': {},
              'fullcopy': {},
              'diverge': diverge,
             }
 
     # find interesting file sets from manifests
     addedinm1 = m1.filesnotin(mb)
     addedinm2 = m2.filesnotin(mb)
-    u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
-    u1u, u2u = u1r, u2r
     bothnew = sorted(addedinm1 & addedinm2)
+    if tca == base:
+        # unmatched file from base
+        u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
+        u1u, u2u = u1r, u2r
+    else:
+        # unmatched file from base (DAG rotation in the graft case)
+        u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2,
+                                      baselabel='base')
+        # unmatched file from topological common ancestors (no DAG rotation)
+        # need to recompute this for directory move handling when grafting
+        mta = tca.manifest()
+        u1u, u2u = _computenonoverlap(repo, c1, c2, m1.filesnotin(mta),
+                                                    m2.filesnotin(mta),
+                                      baselabel='topological common ancestor')
 
     for f in u1u:
         _checkcopies(c1, f, m1, m2, base, tca, limit, data1)
 
     for f in u2u:
         _checkcopies(c2, f, m2, m1, base, tca, limit, data2)
 
     copy = dict(data1['copy'].items() + data2['copy'].items())
     fullcopy = dict(data1['fullcopy'].items() + data2['fullcopy'].items())
 
     renamedelete = {}
     renamedeleteset = set()
     divergeset = set()
     for of, fl in diverge.items():
         if len(fl) == 1 or of in c1 or of in c2:
             del diverge[of] # not actually divergent, or not a rename
             if of not in c1 and of not in c2:
                 # renamed on one side, deleted on the other side, but filter
                 # out files that have been renamed and then deleted
                 renamedelete[of] = [f for f in fl if f in c1 or f in c2]
                 renamedeleteset.update(fl) # reverse map for below
         else:
             divergeset.update(fl) # reverse map for below
 
     if bothnew:
         repo.ui.debug("  unmatched files new in both:\n   %s\n"
                       % "\n   ".join(bothnew))
     bothdiverge = {}
     bothdata = {'copy': {},
                 'fullcopy': {},
                 'diverge': bothdiverge,
                }
     for f in bothnew:
         _checkcopies(c1, f, m1, m2, base, tca, limit, bothdata)
         _checkcopies(c2, f, m2, m1, base, tca, limit, bothdata)
     for of, fl in bothdiverge.items():
         if len(fl) == 2 and fl[0] == fl[1]:
             copy[fl[0]] = of # not actually divergent, just matching renames
 
     if fullcopy and repo.ui.debugflag:
         repo.ui.debug("  all copies found (* = to merge, ! = divergent, "
                       "% = renamed and deleted):\n")
         for f in sorted(fullcopy):
             note = ""
             if f in copy:
                 note += "*"
             if f in divergeset:
                 note += "!"
             if f in renamedeleteset:
                 note += "%"
             repo.ui.debug("   src: '%s' -> dst: '%s' %s\n" % (fullcopy[f], f,
                                                               note))
     del divergeset
 
     if not fullcopy:
         return copy, {}, diverge, renamedelete
 
     repo.ui.debug("  checking for directory renames\n")
 
     # generate a directory move map
     d1, d2 = c1.dirs(), c2.dirs()
     # Hack for adding '', which is not otherwise added, to d1 and d2
     d1.addpath('/')
     d2.addpath('/')
     invalid = set()
     dirmove = {}
 
     # examine each file copy for a potential directory move, which is
     # when all the files in a directory are moved to a new directory
     for dst, src in fullcopy.iteritems():
         dsrc, ddst = pathutil.dirname(src), pathutil.dirname(dst)
         if dsrc in invalid:
             # already seen to be uninteresting
             continue
         elif dsrc in d1 and ddst in d1:
             # directory wasn't entirely moved locally
             invalid.add(dsrc + "/")
         elif dsrc in d2 and ddst in d2:
             # directory wasn't entirely moved remotely
             invalid.add(dsrc + "/")
         elif dsrc + "/" in dirmove and dirmove[dsrc + "/"] != ddst + "/":
             # files from the same directory moved to two different places
             invalid.add(dsrc + "/")
         else:
             # looks good so far
             dirmove[dsrc + "/"] = ddst + "/"
 
     for i in invalid:
         if i in dirmove:
             del dirmove[i]
     del d1, d2, invalid
 
     if not dirmove:
         return copy, {}, diverge, renamedelete
 
     for d in dirmove:
         repo.ui.debug("   discovered dir src: '%s' -> dst: '%s'\n" %
                       (d, dirmove[d]))
 
     movewithdir = {}
     # check unaccounted nonoverlapping files against directory moves
     for f in u1r + u2r:
         if f not in fullcopy:
             for d in dirmove:
                 if f.startswith(d):
                     # new file added in a directory that was moved, move it
                     df = dirmove[d] + f[len(d):]
                     if df not in copy:
                         movewithdir[f] = df
                         repo.ui.debug(("   pending file src: '%s' -> "
                                        "dst: '%s'\n") % (f, df))
                     break
 
     return copy, movewithdir, diverge, renamedelete
 
 def _related(f1, f2, limit):
     """return True if f1 and f2 filectx have a common ancestor
 
     Walk back to common ancestor to see if the two files originate
     from the same file. Since workingfilectx's rev() is None it messes
     up the integer comparison logic, hence the pre-step check for
     None (f1 and f2 can only be workingfilectx's initially).
     """
 
     if f1 == f2:
         return f1 # a match
 
     g1, g2 = f1.ancestors(), f2.ancestors()
     try:
         f1r, f2r = f1.linkrev(), f2.linkrev()
 
         if f1r is None:
             f1 = next(g1)
         if f2r is None:
             f2 = next(g2)
 
         while True:
             f1r, f2r = f1.linkrev(), f2.linkrev()
             if f1r > f2r:
                 f1 = next(g1)
             elif f2r > f1r:
                 f2 = next(g2)
             elif f1 == f2:
                 return f1 # a match
             elif f1r == f2r or f1r < limit or f2r < limit:
                 return False # copy no longer relevant
     except StopIteration:
         return False
 
 def _checkcopies(ctx, f, m1, m2, base, tca, limit, data):
     """
     check possible copies of f from m1 to m2
 
     ctx = starting context for f in m1
     f = the filename to check (as in m1)
     m1 = the source manifest
     m2 = the destination manifest
     base = the changectx used as a merge base
     tca = topological common ancestor for graft-like scenarios
     limit = the rev number to not search beyond
     data = dictionary of dictionary to store copy data. (see mergecopies)
 
     note: limit is only an optimization, and there is no guarantee that
     irrelevant revisions will not be limited
     there is no easy way to make this algorithm stop in a guaranteed way
     once it "goes behind a certain revision".
     """
 
     mb = base.manifest()
     # Might be true if this call is about finding backward renames,
     # This happens in the case of grafts because the DAG is then rotated.
     # If the file exists in both the base and the source, we are not looking
     # for a rename on the source side, but on the part of the DAG that is
     # traversed backwards.
     #
     # In the case there is both backward and forward renames (before and after
     # the base) this is more complicated as we must detect a divergence. This
     # is currently broken and hopefully some later code update will make that
     # work (we use 'backwards = False' in that case)
     backwards = base != tca and f in mb
     getfctx = _makegetfctx(ctx)
 
     of = None
     seen = set([f])
     for oc in getfctx(f, m1[f]).ancestors():
         ocr = oc.linkrev()
         of = oc.path()
         if of in seen:
             # check limit late - grab last rename before
             if ocr < limit:
                 break
             continue
         seen.add(of)
 
         # remember for dir rename detection
         if backwards:
             data['fullcopy'][of] = f # grafting backwards through renames
         else:
             data['fullcopy'][f] = of
         if of not in m2:
             continue # no match, keep looking
         if m2[of] == mb.get(of):
             return # no merge needed, quit early
         c2 = getfctx(of, m2[of])
         # c2 might be a plain new file on added on destination side that is
         # unrelated to the droids we are looking for.
         cr = _related(oc, c2, tca.rev())
         if cr and (of == f or of == c2.path()): # non-divergent
             if backwards:
                 data['copy'][of] = f
             elif of in mb:
                 data['copy'][f] = of
             return
 
     if of in mb:
         data['diverge'].setdefault(of, []).append(f)
 
 def duplicatecopies(repo, rev, fromrev, skiprev=None):
     '''reproduce copies from fromrev to rev in the dirstate
 
     If skiprev is specified, it's a revision that should be used to
     filter copy records. Any copies that occur between fromrev and
     skiprev will not be duplicated, even if they appear in the set of
     copies between fromrev and rev.
     '''
     exclude = {}
     if (skiprev is not None and
         not repo.ui.configbool('experimental', 'disablecopytrace')):
         # disablecopytrace skips this line, but not the entire function because
         # the line below is O(size of the repo) during a rebase, while the rest
         # of the function is much faster (and is required for carrying copy
         # metadata across the rebase anyway).
         exclude = pathcopies(repo[fromrev], repo[skiprev])
     for dst, src in pathcopies(repo[fromrev], repo[rev]).iteritems():
         # copies.pathcopies returns backward renames, so dst might not
         # actually be in the dirstate
         if dst in exclude:
             continue
         if repo.dirstate[dst] in "nma":
             repo.dirstate.copy(src, dst)

tests/test-graft.t

@@ -1,1302 +1,1333
   $ cat >> $HGRCPATH <<EOF
   > [extdiff]
   > # for portability:
   > pdiff = sh "$RUNTESTDIR/pdiff"
   > EOF
 
 Create a repo with some stuff in it:
 
   $ hg init a
   $ cd a
   $ echo a > a
   $ echo a > d
   $ echo a > e
   $ hg ci -qAm0
   $ echo b > a
   $ hg ci -m1 -u bar
   $ hg mv a b
   $ hg ci -m2
   $ hg cp b c
   $ hg ci -m3 -u baz
   $ echo b > d
   $ echo f > e
   $ hg ci -m4
   $ hg up -q 3
   $ echo b > e
   $ hg branch -q stable
   $ hg ci -m5
   $ hg merge -q default --tool internal:local
   $ hg branch -q default
   $ hg ci -m6
   $ hg phase --public 3
   $ hg phase --force --secret 6
 
   $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
   @    [e-mail]: 6
   |\
   | o  [e-mail]: 5
   | |
   o |  [e-mail]: 4
   |/
   o  [e-mail]: 3
   |
   o  [e-mail]: 2
   |
   o  [e-mail]: 1
   |
   o  [e-mail]: 0
   
 Can't continue without starting:
 
   $ hg rm -q e
   $ hg graft --continue
   abort: no graft in progress
   [255]
   $ hg revert -r . -q e
 
 Need to specify a rev:
 
   $ hg graft
   abort: no revisions specified
   [255]
 
 Can't graft ancestor:
 
   $ hg graft 1 2
   skipping ancestor revision 1:5d205f8b35b6
   skipping ancestor revision 2:5c095ad7e90f
   [255]
 
 Specify revisions with -r:
 
   $ hg graft -r 1 -r 2
   skipping ancestor revision 1:5d205f8b35b6
   skipping ancestor revision 2:5c095ad7e90f
   [255]
 
   $ hg graft -r 1 2
   warning: inconsistent use of --rev might give unexpected revision ordering!
   skipping ancestor revision 2:5c095ad7e90f
   skipping ancestor revision 1:5d205f8b35b6
   [255]
 
 Can't graft with dirty wd:
 
   $ hg up -q 0
   $ echo foo > a
   $ hg graft 1
   abort: uncommitted changes
   [255]
   $ hg revert a
 
 Graft a rename:
 (this also tests that editor is invoked if '--edit' is specified)
 
   $ hg status --rev "2^1" --rev 2
   A b
   R a
   $ HGEDITOR=cat hg graft 2 -u foo --edit
   grafting 2:5c095ad7e90f "2"
   merging a and b to b
   2
   
   
   HG: Enter commit message.  Lines beginning with 'HG:' are removed.
   HG: Leave message empty to abort commit.
   HG: --
   HG: user: foo
   HG: branch 'default'
   HG: added b
   HG: removed a
   $ hg export tip --git
   # HG changeset patch
   # User foo
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID ef0ef43d49e79e81ddafdc7997401ba0041efc82
   # Parent  68795b066622ca79a25816a662041d8f78f3cd9e
   2
   
   diff --git a/a b/b
   rename from a
   rename to b
 
 Look for extra:source
 
   $ hg log --debug -r tip
   changeset:   7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
   tag:         tip
   phase:       draft
   parent:      0:68795b066622ca79a25816a662041d8f78f3cd9e
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    7:e59b6b228f9cbf9903d5e9abf996e083a1f533eb
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      b
   files-:      a
   extra:       branch=default
   extra:       source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
   description:
   2
   
   
 
 Graft out of order, skipping a merge and a duplicate
 (this also tests that editor is not invoked if '--edit' is not specified)
 
   $ hg graft 1 5 4 3 'merge()' 2 -n
   skipping ungraftable merge revision 6
   skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
   grafting 1:5d205f8b35b6 "1"
   grafting 5:97f8bfe72746 "5"
   grafting 4:9c233e8e184d "4"
   grafting 3:4c60f11aa304 "3"
 
   $ HGEDITOR=cat hg graft 1 5 'merge()' 2 --debug
   skipping ungraftable merge revision 6
   scanning for duplicate grafts
   skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
   grafting 1:5d205f8b35b6 "1"
     searching for copies back to rev 1
     unmatched files in local:
      b
     all copies found (* = to merge, ! = divergent, % = renamed and deleted):
      src: 'a' -> dst: 'b' *
     checking for directory renames
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 68795b066622, local: ef0ef43d49e7+, remote: 5d205f8b35b6
    preserving b for resolve of b
   starting 4 threads for background file closing (?)
    b: local copied/moved from a -> m (premerge)
   picked tool ':merge' for b (binary False symlink False changedelete False)
   merging b and a to b
   my b@ef0ef43d49e7+ other a@5d205f8b35b6 ancestor a@68795b066622
    premerge successful
   committing files:
   b
   committing manifest
   committing changelog
   grafting 5:97f8bfe72746 "5"
     searching for copies back to rev 1
+    unmatched files in other (from topological common ancestor):
+     c
+    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     src: 'c' -> dst: 'b' *
+    checking for directory renames
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4c60f11aa304, local: 6b9e5368ca4e+, remote: 97f8bfe72746
    e: remote is newer -> g
   getting e
    b: remote unchanged -> k
   committing files:
   e
   committing manifest
   committing changelog
   $ HGEDITOR=cat hg graft 4 3 --log --debug
   scanning for duplicate grafts
   grafting 4:9c233e8e184d "4"
     searching for copies back to rev 1
+    unmatched files in other (from topological common ancestor):
+     c
+    all copies found (* = to merge, ! = divergent, % = renamed and deleted):
+     src: 'c' -> dst: 'b' *
+    checking for directory renames
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 4c60f11aa304, local: 1905859650ec+, remote: 9c233e8e184d
    preserving e for resolve of e
    d: remote is newer -> g
   getting d
    b: remote unchanged -> k
    e: versions differ -> m (premerge)
   picked tool ':merge' for e (binary False symlink False changedelete False)
   merging e
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
    e: versions differ -> m (merge)
   picked tool ':merge' for e (binary False symlink False changedelete False)
   my e@1905859650ec+ other e@9c233e8e184d ancestor e@4c60f11aa304
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue --log')
   [255]
 
 Summary should mention graft:
 
   $ hg summary |grep graft
   commit: 2 modified, 2 unknown, 1 unresolved (graft in progress)
 
 Commit while interrupted should fail:
 
   $ hg ci -m 'commit interrupted graft'
   abort: graft in progress
   (use 'hg graft --continue' or 'hg update' to abort)
   [255]
 
 Abort the graft and try committing:
 
   $ hg up -C .
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo c >> e
   $ hg ci -mtest
 
   $ hg strip . --config extensions.strip=
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/*-backup.hg (glob)
 
 Graft again:
 
   $ hg graft 1 5 4 3 'merge()' 2
   skipping ungraftable merge revision 6
   skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
   skipping revision 1:5d205f8b35b6 (already grafted to 8:6b9e5368ca4e)
   skipping revision 5:97f8bfe72746 (already grafted to 9:1905859650ec)
   grafting 4:9c233e8e184d "4"
   merging e
   warning: conflicts while merging e! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [255]
 
 Continue without resolve should fail:
 
   $ hg graft -c
   grafting 4:9c233e8e184d "4"
   abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
 
 Fix up:
 
   $ echo b > e
   $ hg resolve -m e
   (no more unresolved files)
   continue: hg graft --continue
 
 Continue with a revision should fail:
 
   $ hg graft -c 6
   abort: can't specify --continue and revisions
   [255]
 
   $ hg graft -c -r 6
   abort: can't specify --continue and revisions
   [255]
 
 Continue for real, clobber usernames
 
   $ hg graft -c -U
   grafting 4:9c233e8e184d "4"
   grafting 3:4c60f11aa304 "3"
 
 Compare with original:
 
   $ hg diff -r 6
   $ hg status --rev 0:. -C
   M d
   M e
   A b
     a
   A c
     a
   R a
 
 View graph:
 
   $ hg log -G --template '{author}@{rev}.{phase}: {desc}\n'
   @  [e-mail]: 3
   |
   o  [e-mail]: 4
   |
   o  [e-mail]: 5
   |
   o  [e-mail]: 1
   |
   o  [e-mail]: 2
   |
   | o    [e-mail]: 6
   | |\
   | | o  [e-mail]: 5
   | | |
   | o |  [e-mail]: 4
   | |/
   | o  [e-mail]: 3
   | |
   | o  [e-mail]: 2
   | |
   | o  [e-mail]: 1
   |/
   o  [e-mail]: 0
   
 Graft again onto another branch should preserve the original source
   $ hg up -q 0
   $ echo 'g'>g
   $ hg add g
   $ hg ci -m 7
   created new head
   $ hg graft 7
   grafting 7:ef0ef43d49e7 "2"
 
   $ hg log -r 7 --template '{rev}:{node}\n'
   7:ef0ef43d49e79e81ddafdc7997401ba0041efc82
   $ hg log -r 2 --template '{rev}:{node}\n'
   2:5c095ad7e90f871700f02dd1fa5012cb4498a2d4
 
   $ hg log --debug -r tip
   changeset:   13:7a4785234d87ec1aa420ed6b11afe40fa73e12a9
   tag:         tip
   phase:       draft
   parent:      12:b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
   parent:      -1:0000000000000000000000000000000000000000
   manifest:    13:dc313617b8c32457c0d589e0dbbedfe71f3cd637
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   files+:      b
   files-:      a
   extra:       branch=default
   extra:       intermediate-source=ef0ef43d49e79e81ddafdc7997401ba0041efc82
   extra:       source=5c095ad7e90f871700f02dd1fa5012cb4498a2d4
   description:
   2
   
   
 Disallow grafting an already grafted cset onto its original branch
   $ hg up -q 6
   $ hg graft 7
   skipping already grafted revision 7:ef0ef43d49e7 (was grafted from 2:5c095ad7e90f)
   [255]
 
   $ hg pdiff --config extensions.extdiff= --patch -r 2 -r 13
   --- */hg-5c095ad7e90f.patch	* (glob)
   +++ */hg-7a4785234d87.patch	* (glob)
   @@ -1,18 +1,18 @@
    # HG changeset patch
   -# User test
   +# User foo
    # Date 0 0
    #      Thu Jan 01 00:00:00 1970 +0000
   -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4
   -# Parent  5d205f8b35b66bc36375c9534ffd3237730e8f04
   +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9
   +# Parent  b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
    2
    
   -diff -r 5d205f8b35b6 -r 5c095ad7e90f a
   +diff -r b592ea63bb0c -r 7a4785234d87 a
    --- a/a	Thu Jan 01 00:00:00 1970 +0000
    +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    @@ -1,1 +0,0 @@
   --b
   -diff -r 5d205f8b35b6 -r 5c095ad7e90f b
   +-a
   +diff -r b592ea63bb0c -r 7a4785234d87 b
    --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    +++ b/b	Thu Jan 01 00:00:00 1970 +0000
    @@ -0,0 +1,1 @@
   -+b
   ++a
   [1]
 
   $ hg pdiff --config extensions.extdiff= --patch -r 2 -r 13 -X .
   --- */hg-5c095ad7e90f.patch	* (glob)
   +++ */hg-7a4785234d87.patch	* (glob)
   @@ -1,8 +1,8 @@
    # HG changeset patch
   -# User test
   +# User foo
    # Date 0 0
    #      Thu Jan 01 00:00:00 1970 +0000
   -# Node ID 5c095ad7e90f871700f02dd1fa5012cb4498a2d4
   -# Parent  5d205f8b35b66bc36375c9534ffd3237730e8f04
   +# Node ID 7a4785234d87ec1aa420ed6b11afe40fa73e12a9
   +# Parent  b592ea63bb0c19a6c5c44685ee29a2284f9f1b8f
    2
    
   [1]
 
 Disallow grafting already grafted csets with the same origin onto each other
   $ hg up -q 13
   $ hg graft 2
   skipping revision 2:5c095ad7e90f (already grafted to 13:7a4785234d87)
   [255]
   $ hg graft 7
   skipping already grafted revision 7:ef0ef43d49e7 (13:7a4785234d87 also has origin 2:5c095ad7e90f)
   [255]
 
   $ hg up -q 7
   $ hg graft 2
   skipping revision 2:5c095ad7e90f (already grafted to 7:ef0ef43d49e7)
   [255]
   $ hg graft tip
   skipping already grafted revision 13:7a4785234d87 (7:ef0ef43d49e7 also has origin 2:5c095ad7e90f)
   [255]
 
 Graft with --log
 
   $ hg up -Cq 1
   $ hg graft 3 --log -u foo
   grafting 3:4c60f11aa304 "3"
   warning: can't find ancestor for 'c' copied from 'b'!
   $ hg log --template '{rev}:{node|short} {parents} {desc}\n' -r tip
   14:0c921c65ef1e 1:5d205f8b35b6  3
   (grafted from 4c60f11aa304a54ae1c199feb94e7fc771e51ed8)
 
 Resolve conflicted graft
   $ hg up -q 0
   $ echo b > a
   $ hg ci -m 8
   created new head
   $ echo c > a
   $ hg ci -m 9
   $ hg graft 1 --tool internal:fail
   grafting 1:5d205f8b35b6 "1"
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg resolve --all
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
   $ cat a
   <<<<<<< local: aaa4406d4f0a - test: 9
   c
   =======
   b
   >>>>>>> graft: 5d205f8b35b6  - bar: 1
   $ echo b > a
   $ hg resolve -m a
   (no more unresolved files)
   continue: hg graft --continue
   $ hg graft -c
   grafting 1:5d205f8b35b6 "1"
   $ hg export tip --git
   # HG changeset patch
   # User bar
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID f67661df0c4804d301f064f332b57e7d5ddaf2be
   # Parent  aaa4406d4f0ae9befd6e58c82ec63706460cbca6
   1
   
   diff --git a/a b/a
   --- a/a
   +++ b/a
   @@ -1,1 +1,1 @@
   -c
   +b
 
 Resolve conflicted graft with rename
   $ echo c > a
   $ hg ci -m 10
   $ hg graft 2 --tool internal:fail
   grafting 2:5c095ad7e90f "2"
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg resolve --all
   merging a and b to b
   (no more unresolved files)
   continue: hg graft --continue
   $ hg graft -c
   grafting 2:5c095ad7e90f "2"
   $ hg export tip --git
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 9627f653b421c61fc1ea4c4e366745070fa3d2bc
   # Parent  ee295f490a40b97f3d18dd4c4f1c8936c233b612
   2
   
   diff --git a/a b/b
   rename from a
   rename to b
 
 Test simple origin(), with and without args
   $ hg log -r 'origin()'
   changeset:   1:5d205f8b35b6
   user:        bar
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   2:5c095ad7e90f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   3:4c60f11aa304
   user:        baz
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   4:9c233e8e184d
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   5:97f8bfe72746
   branch:      stable
   parent:      3:4c60f11aa304
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   $ hg log -r 'origin(7)'
   changeset:   2:5c095ad7e90f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 Now transplant a graft to test following through copies
   $ hg up -q 0
   $ hg branch -q dev
   $ hg ci -qm "dev branch"
   $ hg --config extensions.transplant= transplant -q 7
   $ hg log -r 'origin(.)'
   changeset:   2:5c095ad7e90f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 Test that the graft and transplant markers in extra are converted, allowing
 origin() to still work.  Note that these recheck the immediately preceeding two
 tests.
   $ hg --quiet --config extensions.convert= --config convert.hg.saverev=True convert . ../converted
 
 The graft case
   $ hg -R ../converted log -r 7 --template "{rev}: {node}\n{join(extras, '\n')}\n"
   7: 7ae846e9111fc8f57745634250c7b9ac0a60689b
   branch=default
   convert_revision=ef0ef43d49e79e81ddafdc7997401ba0041efc82
   source=e0213322b2c1a5d5d236c74e79666441bee67a7d
   $ hg -R ../converted log -r 'origin(7)'
   changeset:   2:e0213322b2c1
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 Test that template correctly expands more than one 'extra' (issue4362), and that
 'intermediate-source' is converted.
   $ hg -R ../converted log -r 13 --template "{extras % ' Extra: {extra}\n'}"
    Extra: branch=default
    Extra: convert_revision=7a4785234d87ec1aa420ed6b11afe40fa73e12a9
    Extra: intermediate-source=7ae846e9111fc8f57745634250c7b9ac0a60689b
    Extra: source=e0213322b2c1a5d5d236c74e79666441bee67a7d
 
 The transplant case
   $ hg -R ../converted log -r tip --template "{rev}: {node}\n{join(extras, '\n')}\n"
   21: fbb6c5cc81002f2b4b49c9d731404688bcae5ade
   branch=dev
   convert_revision=7e61b508e709a11d28194a5359bc3532d910af21
   transplant_source=z\xe8F\xe9\x11\x1f\xc8\xf5wEcBP\xc7\xb9\xac (esc)
   `h\x9b (esc)
   $ hg -R ../converted log -r 'origin(tip)'
   changeset:   2:e0213322b2c1
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 
 Test simple destination
   $ hg log -r 'destination()'
   changeset:   7:ef0ef43d49e7
   parent:      0:68795b066622
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   8:6b9e5368ca4e
   user:        bar
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   9:1905859650ec
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     5
   
   changeset:   10:52dc0b4c6907
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     4
   
   changeset:   11:882b35362a6b
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   13:7a4785234d87
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   14:0c921c65ef1e
   parent:      1:5d205f8b35b6
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     3
   
   changeset:   17:f67661df0c48
   user:        bar
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     1
   
   changeset:   19:9627f653b421
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   21:7e61b508e709
   branch:      dev
   tag:         tip
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   $ hg log -r 'destination(2)'
   changeset:   7:ef0ef43d49e7
   parent:      0:68795b066622
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   13:7a4785234d87
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   19:9627f653b421
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   21:7e61b508e709
   branch:      dev
   tag:         tip
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 Transplants of grafts can find a destination...
   $ hg log -r 'destination(7)'
   changeset:   21:7e61b508e709
   branch:      dev
   tag:         tip
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 ... grafts of grafts unfortunately can't
   $ hg graft -q 13
   warning: can't find ancestor for 'b' copied from 'a'!
   $ hg log -r 'destination(13)'
 All copies of a cset
   $ hg log -r 'origin(13) or destination(origin(13))'
   changeset:   2:5c095ad7e90f
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   7:ef0ef43d49e7
   parent:      0:68795b066622
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   13:7a4785234d87
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   19:9627f653b421
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   21:7e61b508e709
   branch:      dev
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
   changeset:   22:d1cb6591fa4b
   branch:      dev
   tag:         tip
   user:        foo
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     2
   
 
 graft works on complex revset
 
   $ hg graft 'origin(13) or destination(origin(13))'
   skipping ancestor revision 21:7e61b508e709
   skipping ancestor revision 22:d1cb6591fa4b
   skipping revision 2:5c095ad7e90f (already grafted to 22:d1cb6591fa4b)
   grafting 7:ef0ef43d49e7 "2"
   warning: can't find ancestor for 'b' copied from 'a'!
   grafting 13:7a4785234d87 "2"
   warning: can't find ancestor for 'b' copied from 'a'!
   grafting 19:9627f653b421 "2"
   merging b
   warning: can't find ancestor for 'b' copied from 'a'!
 
 graft with --force (still doesn't graft merges)
 
   $ hg graft 19 0 6
   skipping ungraftable merge revision 6
   skipping ancestor revision 0:68795b066622
   skipping already grafted revision 19:9627f653b421 (22:d1cb6591fa4b also has origin 2:5c095ad7e90f)
   [255]
   $ hg graft 19 0 6 --force
   skipping ungraftable merge revision 6
   grafting 19:9627f653b421 "2"
   merging b
   warning: can't find ancestor for 'b' copied from 'a'!
   grafting 0:68795b066622 "0"
 
 graft --force after backout
 
   $ echo abc > a
   $ hg ci -m 28
   $ hg backout 28
   reverting a
   changeset 29:53177ba928f6 backs out changeset 28:50a516bb8b57
   $ hg graft 28
   skipping ancestor revision 28:50a516bb8b57
   [255]
   $ hg graft 28 --force
   grafting 28:50a516bb8b57 "28"
   merging a
   $ cat a
   abc
 
 graft --continue after --force
 
   $ echo def > a
   $ hg ci -m 31
   $ hg graft 28 --force --tool internal:fail
   grafting 28:50a516bb8b57 "28"
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg resolve --all
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   [1]
   $ echo abc > a
   $ hg resolve -m a
   (no more unresolved files)
   continue: hg graft --continue
   $ hg graft -c
   grafting 28:50a516bb8b57 "28"
   $ cat a
   abc
 
 Continue testing same origin policy, using revision numbers from test above
 but do some destructive editing of the repo:
 
   $ hg up -qC 7
   $ hg tag -l -r 13 tmp
   $ hg --config extensions.strip= strip 2
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/5c095ad7e90f-d323a1e4-backup.hg (glob)
   $ hg graft tmp
   skipping already grafted revision 8:7a4785234d87 (2:ef0ef43d49e7 also has unknown origin 5c095ad7e90f)
   [255]
 
 Empty graft
 
   $ hg up -qr 26
   $ hg tag -f something
   $ hg graft -qr 27
   $ hg graft -f 27
   grafting 27:ed6c7e54e319 "28"
   note: graft of 27:ed6c7e54e319 created no changes to commit
 
   $ cd ..
 
 Graft to duplicate a commit
 
   $ hg init graftsibling
   $ cd graftsibling
   $ touch a
   $ hg commit -qAm a
   $ touch b
   $ hg commit -qAm b
   $ hg log -G -T '{rev}\n'
   @  1
   |
   o  0
   
   $ hg up -q 0
   $ hg graft -r 1
   grafting 1:0e067c57feba "b" (tip)
   $ hg log -G -T '{rev}\n'
   @  2
   |
   | o  1
   |/
   o  0
   
 Graft to duplicate a commit twice
 
   $ hg up -q 0
   $ hg graft -r 2
   grafting 2:044ec77f6389 "b" (tip)
   $ hg log -G -T '{rev}\n'
   @  3
   |
   | o  2
   |/
   | o  1
   |/
   o  0
   
 Graft from behind a move or rename
 ==================================
 
 NOTE: This is affected by issue5343, and will need updating when it's fixed
 
 Possible cases during a regular graft (when ca is between cta and c2):
 
 name | c1<-cta | cta<->ca | ca->c2
 A.0  |         |          |
 A.1  |    X    |          |
 A.2  |         |     X    |
 A.3  |         |          |   X
 A.4  |    X    |     X    |
 A.5  |    X    |          |   X
 A.6  |         |     X    |   X
 A.7  |    X    |     X    |   X
 
 A.0 is trivial, and doesn't need copy tracking.
 For A.1, a forward rename is recorded in the c1 pass, to be followed later.
 In A.2, the rename is recorded in the c2 pass and followed backwards.
 A.3 is recorded in the c2 pass as a forward rename to be duplicated on target.
 In A.4, both passes of checkcopies record incomplete renames, which are
 then joined in mergecopies to record a rename to be followed.
 In A.5 and A.7, the c1 pass records an incomplete rename, while the c2 pass
 records an incomplete divergence. The incomplete rename is then joined to the
 appropriate side of the incomplete divergence, and the result is recorded as a
 divergence. The code doesn't distinguish at all between these two cases, since
 the end result of them is the same: an incomplete divergence joined with an
 incomplete rename into a divergence.
 Finally, A.6 records a divergence entirely in the c2 pass.
 
 A.4 has a degenerate case a<-b<-a->a, where checkcopies isn't needed at all.
 A.5 has a special case a<-b<-b->a, which is treated like a<-b->a in a merge.
 A.6 has a special case a<-a<-b->a. Here, checkcopies will find a spurious
 incomplete divergence, which is in fact complete. This is handled later in
 mergecopies.
 A.7 has 4 special cases: a<-b<-a->b (the "ping-pong" case), a<-b<-c->b,
 a<-b<-a->c and a<-b<-c->a. Of these, only the "ping-pong" case is interesting,
 the others are fairly trivial (a<-b<-c->b and a<-b<-a->c proceed like the base
 case, a<-b<-c->a is treated the same as a<-b<-b->a).
 
 f5a therefore tests the "ping-pong" rename case, where a file is renamed to the
 same name on both branches, then the rename is backed out on one branch, and
 the backout is grafted to the other branch. This creates a challenging rename
 sequence of a<-b<-a->b in the graft target, topological CA, graft CA and graft
 source, respectively. Since rename detection will run on the c1 side for such a
 sequence (as for technical reasons, we split the c1 and c2 sides not at the
 graft CA, but rather at the topological CA), it will pick up a false rename,
 and cause a spurious merge conflict. This false rename is always exactly the
 reverse of the true rename that would be detected on the c2 side, so we can
 correct for it by detecting this condition and reversing as necessary.
 
 First, set up the repository with commits to be grafted
 
   $ hg init ../graftmove
   $ cd ../graftmove
   $ echo c1a > f1a
   $ echo c2a > f2a
   $ echo c3a > f3a
   $ echo c4a > f4a
   $ echo c5a > f5a
   $ hg ci -qAm A0
   $ hg mv f1a f1b
   $ hg mv f3a f3b
   $ hg mv f5a f5b
   $ hg ci -qAm B0
   $ echo c1c > f1b
   $ hg mv f2a f2c
   $ hg mv f5b f5a
   $ echo c5c > f5a
   $ hg ci -qAm C0
   $ hg mv f3b f3d
   $ echo c4d > f4a
   $ hg ci -qAm D0
   $ hg log -G
   @  changeset:   3:b69f5839d2d9
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     D0
   |
   o  changeset:   2:f58c7e2b28fa
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     C0
   |
   o  changeset:   1:3d7bba921b5d
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     B0
   |
   o  changeset:   0:11f7a1b56675
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A0
   
 
 Test the cases A.2 (f1x), A.3 (f2x) and a special case of A.6 (f5x) where the
 two renames actually converge to the same name (thus no actual divergence).
 
   $ hg up -q 'desc("A0")'
   $ HGEDITOR="echo C1 >" hg graft -r 'desc("C0")' --edit
   grafting 2:f58c7e2b28fa "C0"
+  merging f1a and f1b to f1a
   merging f5a
   warning: conflicts while merging f5a! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg resolve f5a -t ':other' # XXX work around failure
   (no more unresolved files)
   continue: hg graft --continue
   $ hg graft --continue # XXX work around failure
   grafting 2:f58c7e2b28fa "C0"
   warning: can't find ancestor for 'f5a' copied from 'f5b'!
   $ hg status --change .
+  M f1a
   M f5a
-  A f1b
   A f2c
   R f2a
   $ hg cat f1a
-  c1a
+  c1c
   $ hg cat f1b
-  c1c
+  f1b: no such file in rev 43e4b415492d
+  [1]
 
 Test the cases A.0 (f4x) and A.6 (f3x)
 
   $ HGEDITOR="echo D1 >" hg graft -r 'desc("D0")' --edit
   grafting 3:b69f5839d2d9 "D0"
   warning: can't find ancestor for 'f3d' copied from 'f3b'!
 
 Set up the repository for some further tests
 
   $ hg up -q "min(desc("A0"))"
   $ hg mv f1a f1e
   $ echo c2e > f2a
   $ hg mv f3a f3e
   $ hg mv f4a f4e
   $ hg mv f5a f5b
   $ hg ci -qAm "E0"
   $ hg log -G
   @  changeset:   6:ebba59d1fb02
   |  tag:         tip
   |  parent:      0:11f7a1b56675
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     E0
   |
-  | o  changeset:   5:573bb6b4b56d
+  | o  changeset:   5:4f4ba7a6e606
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     D1
   | |
-  | o  changeset:   4:af23416e619b
+  | o  changeset:   4:43e4b415492d
   |/   parent:      0:11f7a1b56675
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     C0
   |
   | o  changeset:   3:b69f5839d2d9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     D0
   | |
   | o  changeset:   2:f58c7e2b28fa
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  summary:     C0
   | |
   | o  changeset:   1:3d7bba921b5d
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     B0
   |
   o  changeset:   0:11f7a1b56675
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     A0
   
 
 Test the cases A.4 (f1x), the "ping-pong" special case of A.7 (f5x),
 and A.3 with a local content change to be preserved (f2x).
 
   $ HGEDITOR="echo C2 >" hg graft -r 'desc("C0")' --edit
   grafting 2:f58c7e2b28fa "C0"
   other [graft] changed f1b which local [local] deleted
   use (c)hanged version, leave (d)eleted, or leave (u)nresolved? u
   merging f2a and f2c to f2c
+  merging f5b and f5a to f5a
   abort: unresolved conflicts, can't continue
   (use 'hg resolve' and 'hg graft --continue')
   [255]
   $ hg resolve f1b -t ':other' # XXX work around failure
   (no more unresolved files)
   continue: hg graft --continue
   $ hg graft --continue # XXX work around failure
   grafting 2:f58c7e2b28fa "C0"
-  grafting 4:af23416e619b "C0"
+  grafting 4:43e4b415492d "C0"
+  merging f1e and f1a to f1e
   merging f2c
   warning: can't find ancestor for 'f2c' copied from 'f2a'!
 
 Test the cases A.1 (f4x) and A.7 (f3x).
 
   $ HGEDITOR="echo D2 >" hg graft -r 'desc("D0")' --edit
   grafting 3:b69f5839d2d9 "D0"
   merging f4e and f4a to f4e
   warning: can't find ancestor for 'f3d' copied from 'f3b'!
 
 Check the results of the grafts tested
 
   $ hg log -CGv --patch --git
-  @  changeset:   9:6d76b84e6e84
+  @  changeset:   9:100f4d78e056
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  files:       f3d f4e
   |  description:
   |  D2
   |
   |
   |  diff --git a/f3d b/f3d
   |  new file mode 100644
   |  --- /dev/null
   |  +++ b/f3d
   |  @@ -0,0 +1,1 @@
   |  +c3a
   |  diff --git a/f4e b/f4e
   |  --- a/f4e
   |  +++ b/f4e
   |  @@ -1,1 +1,1 @@
   |  -c4a
   |  +c4d
   |
-  o  changeset:   8:3079ba7d03f0
+  o  changeset:   8:84915a7da133
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
+  |  files:       f1e f5a.orig
   |  description:
   |  C0
   |
   |
+  |  diff --git a/f1e b/f1e
+  |  --- a/f1e
+  |  +++ b/f1e
+  |  @@ -1,1 +1,1 @@
+  |  -c1a
+  |  +c1c
+  |  diff --git a/f5a.orig b/f5a.orig
+  |  deleted file mode 100644
+  |  --- a/f5a.orig
+  |  +++ /dev/null
+  |  @@ -1,5 +0,0 @@
+  |  -<<<<<<< local: 11f7a1b56675  - test: A0
+  |  -c5a
+  |  -=======
+  |  -c5c
+  |  ->>>>>>> graft: f58c7e2b28fa  - test: C0
   |
   o  changeset:   7:dc778749ee9a
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  files:       f1b f2a f2c f5a f5b
   |  copies:      f2c (f2a) f5a (f5b)
   |  description:
   |  C0
   |
   |
   |  diff --git a/f1b b/f1b
   |  new file mode 100644
   |  --- /dev/null
   |  +++ b/f1b
   |  @@ -0,0 +1,1 @@
   |  +c1c
   |  diff --git a/f2a b/f2c
   |  rename from f2a
   |  rename to f2c
   |  diff --git a/f5b b/f5a
   |  rename from f5b
   |  rename to f5a
   |  --- a/f5b
   |  +++ b/f5a
   |  @@ -1,1 +1,1 @@
   |  -c5a
   |  +c5c
   |
   o  changeset:   6:ebba59d1fb02
   |  parent:      0:11f7a1b56675
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  files:       f1a f1e f2a f3a f3e f4a f4e f5a f5a.orig f5b
   |  copies:      f1e (f1a) f3e (f3a) f4e (f4a) f5b (f5a)
   |  description:
   |  E0
   |
   |
   |  diff --git a/f1a b/f1e
   |  rename from f1a
   |  rename to f1e
   |  diff --git a/f2a b/f2a
   |  --- a/f2a
   |  +++ b/f2a
   |  @@ -1,1 +1,1 @@
   |  -c2a
   |  +c2e
   |  diff --git a/f3a b/f3e
   |  rename from f3a
   |  rename to f3e
   |  diff --git a/f4a b/f4e
   |  rename from f4a
   |  rename to f4e
   |  diff --git a/f5a.orig b/f5a.orig
   |  new file mode 100644
   |  --- /dev/null
   |  +++ b/f5a.orig
   |  @@ -0,0 +1,5 @@
   |  +<<<<<<< local: 11f7a1b56675  - test: A0
   |  +c5a
   |  +=======
   |  +c5c
   |  +>>>>>>> graft: f58c7e2b28fa  - test: C0
   |  diff --git a/f5a b/f5b
   |  rename from f5a
   |  rename to f5b
   |
-  | o  changeset:   5:573bb6b4b56d
+  | o  changeset:   5:4f4ba7a6e606
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  files:       f3d f4a
   | |  description:
   | |  D1
   | |
   | |
   | |  diff --git a/f3d b/f3d
   | |  new file mode 100644
   | |  --- /dev/null
   | |  +++ b/f3d
   | |  @@ -0,0 +1,1 @@
   | |  +c3a
   | |  diff --git a/f4a b/f4a
   | |  --- a/f4a
   | |  +++ b/f4a
   | |  @@ -1,1 +1,1 @@
   | |  -c4a
   | |  +c4d
   | |
-  | o  changeset:   4:af23416e619b
+  | o  changeset:   4:43e4b415492d
   |/   parent:      0:11f7a1b56675
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
-  |    files:       f1b f2a f2c f5a
+  |    files:       f1a f2a f2c f5a
   |    copies:      f2c (f2a)
   |    description:
   |    C0
   |
   |
-  |    diff --git a/f1b b/f1b
-  |    new file mode 100644
-  |    --- /dev/null
-  |    +++ b/f1b
-  |    @@ -0,0 +1,1 @@
+  |    diff --git a/f1a b/f1a
+  |    --- a/f1a
+  |    +++ b/f1a
+  |    @@ -1,1 +1,1 @@
+  |    -c1a
   |    +c1c
   |    diff --git a/f2a b/f2c
   |    rename from f2a
   |    rename to f2c
   |    diff --git a/f5a b/f5a
   |    --- a/f5a
   |    +++ b/f5a
   |    @@ -1,1 +1,1 @@
   |    -c5a
   |    +c5c
   |
   | o  changeset:   3:b69f5839d2d9
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  files:       f3b f3d f4a
   | |  copies:      f3d (f3b)
   | |  description:
   | |  D0
   | |
   | |
   | |  diff --git a/f3b b/f3d
   | |  rename from f3b
   | |  rename to f3d
   | |  diff --git a/f4a b/f4a
   | |  --- a/f4a
   | |  +++ b/f4a
   | |  @@ -1,1 +1,1 @@
   | |  -c4a
   | |  +c4d
   | |
   | o  changeset:   2:f58c7e2b28fa
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
   | |  files:       f1b f2a f2c f5a f5b
   | |  copies:      f2c (f2a) f5a (f5b)
   | |  description:
   | |  C0
   | |
   | |
   | |  diff --git a/f1b b/f1b
   | |  --- a/f1b
   | |  +++ b/f1b
   | |  @@ -1,1 +1,1 @@
   | |  -c1a
   | |  +c1c
   | |  diff --git a/f2a b/f2c
   | |  rename from f2a
   | |  rename to f2c
   | |  diff --git a/f5b b/f5a
   | |  rename from f5b
   | |  rename to f5a
   | |  --- a/f5b
   | |  +++ b/f5a
   | |  @@ -1,1 +1,1 @@
   | |  -c5a
   | |  +c5c
   | |
   | o  changeset:   1:3d7bba921b5d
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    files:       f1a f1b f3a f3b f5a f5b
   |    copies:      f1b (f1a) f3b (f3a) f5b (f5a)
   |    description:
   |    B0
   |
   |
   |    diff --git a/f1a b/f1b
   |    rename from f1a
   |    rename to f1b
   |    diff --git a/f3a b/f3b
   |    rename from f3a
   |    rename to f3b
   |    diff --git a/f5a b/f5b
   |    rename from f5a
   |    rename to f5b
   |
   o  changeset:   0:11f7a1b56675
      user:        test
      date:        Thu Jan 01 00:00:00 1970 +0000
      files:       f1a f2a f3a f4a f5a
      description:
      A0
   
   
      diff --git a/f1a b/f1a
      new file mode 100644
      --- /dev/null
      +++ b/f1a
      @@ -0,0 +1,1 @@
      +c1a
      diff --git a/f2a b/f2a
      new file mode 100644
      --- /dev/null
      +++ b/f2a
      @@ -0,0 +1,1 @@
      +c2a
      diff --git a/f3a b/f3a
      new file mode 100644
      --- /dev/null
      +++ b/f3a
      @@ -0,0 +1,1 @@
      +c3a
      diff --git a/f4a b/f4a
      new file mode 100644
      --- /dev/null
      +++ b/f4a
      @@ -0,0 +1,1 @@
      +c4a
      diff --git a/f5a b/f5a
      new file mode 100644
      --- /dev/null
      +++ b/f5a
      @@ -0,0 +1,1 @@
      +c5a
   
   $ hg cat f2c
   c2e

tests/test-rebase-conflicts.t

@@ -1,359 +1,363
   $ cat >> $HGRCPATH <<EOF
   > [format]
   > usegeneraldelta=yes
   > [extensions]
   > rebase=
   > 
   > [phases]
   > publish=False
   > 
   > [alias]
   > tglog = log -G --template "{rev}:{phase} '{desc}' {branches} {bookmarks}\n"
   > EOF
 
   $ hg init a
   $ cd a
   $ echo c1 >common
   $ hg add common
   $ hg ci -m C1
 
   $ echo c2 >>common
   $ hg ci -m C2
 
   $ echo c3 >>common
   $ hg ci -m C3
 
   $ hg up -q -C 1
 
   $ echo l1 >>extra
   $ hg add extra
   $ hg ci -m L1
   created new head
 
   $ sed -e 's/c2/l2/' common > common.new
   $ mv common.new common
   $ hg ci -m L2
 
   $ echo l3 >> extra2
   $ hg add extra2
   $ hg ci -m L3
   $ hg bookmark mybook
 
   $ hg phase --force --secret 4
 
   $ hg tglog
   @  5:secret 'L3'  mybook
   |
   o  4:secret 'L2'
   |
   o  3:draft 'L1'
   |
   | o  2:draft 'C3'
   |/
   o  1:draft 'C2'
   |
   o  0:draft 'C1'
   
 Try to call --continue:
 
   $ hg rebase --continue
   abort: no rebase in progress
   [255]
 
 Conflicting rebase:
 
   $ hg rebase -s 3 -d 2
   rebasing 3:3163e20567cc "L1"
   rebasing 4:46f0b057b5c0 "L2"
   merging common
   warning: conflicts while merging common! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
 
 Try to continue without solving the conflict:
 
   $ hg rebase --continue
   already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
   rebasing 4:46f0b057b5c0 "L2"
   abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
 
 Conclude rebase:
 
   $ echo 'resolved merge' >common
   $ hg resolve -m common
   (no more unresolved files)
   continue: hg rebase --continue
   $ hg rebase --continue
   already rebased 3:3163e20567cc "L1" as 3e046f2ecedb
   rebasing 4:46f0b057b5c0 "L2"
   rebasing 5:8029388f38dc "L3" (mybook)
   saved backup bundle to $TESTTMP/a/.hg/strip-backup/3163e20567cc-5ca4656e-backup.hg (glob)
 
   $ hg tglog
   @  5:secret 'L3'  mybook
   |
   o  4:secret 'L2'
   |
   o  3:draft 'L1'
   |
   o  2:draft 'C3'
   |
   o  1:draft 'C2'
   |
   o  0:draft 'C1'
   
 Check correctness:
 
   $ hg cat -r 0 common
   c1
 
   $ hg cat -r 1 common
   c1
   c2
 
   $ hg cat -r 2 common
   c1
   c2
   c3
 
   $ hg cat -r 3 common
   c1
   c2
   c3
 
   $ hg cat -r 4 common
   resolved merge
 
   $ hg cat -r 5 common
   resolved merge
 
 Bookmark stays active after --continue
   $ hg bookmarks
    * mybook                    5:d67b21408fc0
 
   $ cd ..
 
 Check that the right ancestors is used while rebasing a merge (issue4041)
 
   $ hg clone "$TESTDIR/bundles/issue4041.hg" issue4041
   requesting all changes
   adding changesets
   adding manifests
   adding file changes
   added 11 changesets with 8 changes to 3 files (+1 heads)
   updating to branch default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd issue4041
   $ hg log -G
   o    changeset:   10:2f2496ddf49d
   |\   branch:      f1
   | |  tag:         tip
   | |  parent:      7:4c9fbe56a16f
   | |  parent:      9:e31216eec445
   | |  user:        szhang
   | |  date:        Thu Sep 05 12:59:39 2013 -0400
   | |  summary:     merge
   | |
   | o  changeset:   9:e31216eec445
   | |  branch:      f1
   | |  user:        szhang
   | |  date:        Thu Sep 05 12:59:10 2013 -0400
   | |  summary:     more changes to f1
   | |
   | o    changeset:   8:8e4e2c1a07ae
   | |\   branch:      f1
   | | |  parent:      2:4bc80088dc6b
   | | |  parent:      6:400110238667
   | | |  user:        szhang
   | | |  date:        Thu Sep 05 12:57:59 2013 -0400
   | | |  summary:     bad merge
   | | |
   o | |  changeset:   7:4c9fbe56a16f
   |/ /   branch:      f1
   | |    parent:      2:4bc80088dc6b
   | |    user:        szhang
   | |    date:        Thu Sep 05 12:54:00 2013 -0400
   | |    summary:     changed f1
   | |
   | o  changeset:   6:400110238667
   | |  branch:      f2
   | |  parent:      4:12e8ec6bb010
   | |  user:        szhang
   | |  date:        Tue Sep 03 13:58:02 2013 -0400
   | |  summary:     changed f2 on f2
   | |
   | | @  changeset:   5:d79e2059b5c0
   | | |  parent:      3:8a951942e016
   | | |  user:        szhang
   | | |  date:        Tue Sep 03 13:57:39 2013 -0400
   | | |  summary:     changed f2 on default
   | | |
   | o |  changeset:   4:12e8ec6bb010
   | |/   branch:      f2
   | |    user:        szhang
   | |    date:        Tue Sep 03 13:57:18 2013 -0400
   | |    summary:     created f2 branch
   | |
   | o  changeset:   3:8a951942e016
   | |  parent:      0:24797d4f68de
   | |  user:        szhang
   | |  date:        Tue Sep 03 13:57:11 2013 -0400
   | |  summary:     added f2.txt
   | |
   o |  changeset:   2:4bc80088dc6b
   | |  branch:      f1
   | |  user:        szhang
   | |  date:        Tue Sep 03 13:56:20 2013 -0400
   | |  summary:     added f1.txt
   | |
   o |  changeset:   1:ef53c9e6b608
   |/   branch:      f1
   |    user:        szhang
   |    date:        Tue Sep 03 13:55:26 2013 -0400
   |    summary:     created f1 branch
   |
   o  changeset:   0:24797d4f68de
      user:        szhang
      date:        Tue Sep 03 13:55:08 2013 -0400
      summary:     added default.txt
   
   $ hg rebase -s9 -d2 --debug # use debug to really check merge base used
   rebase onto 4bc80088dc6b starting from e31216eec445
   ignoring null merge rebase of 3
   ignoring null merge rebase of 4
   ignoring null merge rebase of 6
   ignoring null merge rebase of 8
   rebasing 9:e31216eec445 "more changes to f1"
    future parents are 2 and -1
   rebase status stored
    update to 2:4bc80088dc6b
   resolving manifests
    branchmerge: False, force: True, partial: False
    ancestor: d79e2059b5c0+, local: d79e2059b5c0+, remote: 4bc80088dc6b
    f2.txt: other deleted -> r
   removing f2.txt
    f1.txt: remote created -> g
   getting f1.txt
    merge against 9:e31216eec445
      detach base 8:8e4e2c1a07ae
     searching for copies back to rev 3
+    unmatched files in other (from topological common ancestor):
+     f2.txt
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: 8e4e2c1a07ae, local: 4bc80088dc6b+, remote: e31216eec445
    f1.txt: remote is newer -> g
   getting f1.txt
   committing files:
   f1.txt
   committing manifest
   committing changelog
   rebased as 19c888675e13
   rebasing 10:2f2496ddf49d "merge" (tip)
    future parents are 11 and 7
   rebase status stored
    already in target
    merge against 10:2f2496ddf49d
      detach base 9:e31216eec445
     searching for copies back to rev 3
+    unmatched files in other (from topological common ancestor):
+     f2.txt
   resolving manifests
    branchmerge: True, force: True, partial: False
    ancestor: e31216eec445, local: 19c888675e13+, remote: 2f2496ddf49d
    f1.txt: remote is newer -> g
   getting f1.txt
   committing files:
   f1.txt
   committing manifest
   committing changelog
   rebased as 2a7f09cac94c
   rebase merging completed
   update back to initial working directory parent
   resolving manifests
    branchmerge: False, force: False, partial: False
    ancestor: 2a7f09cac94c, local: 2a7f09cac94c+, remote: d79e2059b5c0
    f1.txt: other deleted -> r
   removing f1.txt
    f2.txt: remote created -> g
   getting f2.txt
   2 changesets found
   list of changesets:
   e31216eec445e44352c5f01588856059466a24c9
   2f2496ddf49d69b5ef23ad8cf9fb2e0e4faf0ac2
   bundle2-output-bundle: "HG20", (1 params) 1 parts total
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   saved backup bundle to $TESTTMP/issue4041/.hg/strip-backup/e31216eec445-15f7a814-backup.hg (glob)
   3 changesets found
   list of changesets:
   4c9fbe56a16f30c0d5dcc40ec1a97bbe3325209c
   19c888675e133ab5dff84516926a65672eaf04d9
   2a7f09cac94c7f4b73ebd5cd1a62d3b2e8e336bf
   bundle2-output-bundle: "HG20", 1 parts total
   bundle2-output-part: "changegroup" (params: 1 mandatory 1 advisory) streamed payload
   adding branch
   bundle2-input-bundle: with-transaction
   bundle2-input-part: "changegroup" (params: 1 mandatory 1 advisory) supported
   adding changesets
   add changeset 4c9fbe56a16f
   add changeset 19c888675e13
   add changeset 2a7f09cac94c
   adding manifests
   adding file changes
   adding f1.txt revisions
   added 2 changesets with 2 changes to 1 files
   bundle2-input-part: total payload size 1713
   bundle2-input-bundle: 0 parts total
   invalid branchheads cache (served): tip differs
   history modification detected - truncating revision branch cache to revision 9
   rebase completed
   truncating cache/rbc-revs-v1 to 72
 
 Test minimization of merge conflicts
   $ hg up -q null
   $ echo a > a
   $ hg add a
   $ hg commit -q -m 'a'
   $ echo b >> a
   $ hg commit -q -m 'ab'
   $ hg bookmark ab
   $ hg up -q '.^'
   $ echo b >> a
   $ echo c >> a
   $ hg commit -q -m 'abc'
   $ hg rebase -s 7bc217434fc1 -d ab --keep
   rebasing 13:7bc217434fc1 "abc" (tip)
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg diff
   diff -r 328e4ab1f7cc a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	* (glob)
   @@ -1,2 +1,6 @@
    a
    b
   +<<<<<<< dest:   328e4ab1f7cc  ab - test: ab
   +=======
   +c
   +>>>>>>> source: 7bc217434fc1 - test: abc
   $ hg rebase --abort
   rebase aborted
   $ hg up -q -C 7bc217434fc1
   $ hg rebase -s . -d ab --keep -t internal:merge3
   rebasing 13:7bc217434fc1 "abc" (tip)
   merging a
   warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   unresolved conflicts (see hg resolve, then hg rebase --continue)
   [1]
   $ hg diff
   diff -r 328e4ab1f7cc a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	* (glob)
   @@ -1,2 +1,8 @@
    a
   +<<<<<<< dest:   328e4ab1f7cc  ab - test: ab
    b
   +||||||| base
   +=======
   +b
   +c
   +>>>>>>> source: 7bc217434fc1 - test: abc