merge: unify merge and copy actions

mercurial/merge.py

@@ -1,463 +1,443 b''
 # merge.py - directory-level update/merge handling for Mercurial
 #
 # Copyright 2006 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms
 # of the GNU General Public License, incorporated herein by reference.
 
 from node import *
 from i18n import gettext as _
 from demandload import *
 demandload(globals(), "errno util os tempfile")
 
 def filemerge(repo, fw, fo, fd, wctx, mctx, move):
     """perform a 3-way merge in the working directory
 
     fw = filename in the working directory and first parent
     fo = filename in other parent
     fd = destination filename
     wctx, mctx = working and merge changecontexts
     move = whether to move or copy the file to the destination
 
     TODO:
       if fw is copied in the working directory, we get confused
       implement move and fd
     """
 
     def temp(prefix, ctx):
         pre = "%s~%s." % (os.path.basename(ctx.path()), prefix)
         (fd, name) = tempfile.mkstemp(prefix=pre)
         f = os.fdopen(fd, "wb")
         repo.wwrite(ctx.path(), ctx.data(), f)
         f.close()
         return name
 
     fcm = wctx.filectx(fw)
     fco = mctx.filectx(fo)
     fca = fcm.ancestor(fco)
     if not fca:
         fca = repo.filectx(fw, fileid=-1)
     a = repo.wjoin(fw)
     b = temp("base", fca)
     c = temp("other", fco)
 
     repo.ui.note(_("resolving %s\n") % fw)
     repo.ui.debug(_("my %s other %s ancestor %s\n") % (fcm, fco, fca))
 
     cmd = (os.environ.get("HGMERGE") or repo.ui.config("ui", "merge")
            or "hgmerge")
     r = util.system('%s "%s" "%s" "%s"' % (cmd, a, b, c), cwd=repo.root,
                     environ={'HG_FILE': fw,
                              'HG_MY_NODE': str(wctx.parents()[0]),
                              'HG_OTHER_NODE': str(mctx)})
     if r:
         repo.ui.warn(_("merging %s failed!\n") % fw)
     else:
         if fd != fw:
             repo.ui.debug(_("copying %s to %s\n") % (fw, fd))
             repo.wwrite(fd, repo.wread(fw))
             if move:
                 repo.ui.debug(_("removing %s\n") % fw)
                 os.unlink(a)
 
     os.unlink(b)
     os.unlink(c)
     return r
 
 def checkunknown(repo, m2, wctx):
     """
     check for collisions between unknown files and files in m2
     """
     for f in wctx.unknown():
         if f in m2:
             if repo.file(f).cmp(m2[f], repo.wread(f)):
                 raise util.Abort(_("'%s' already exists in the working"
                                    " dir and differs from remote") % f)
 
 def forgetremoved(m2, wctx):
     """
     Forget removed files
 
     If we're jumping between revisions (as opposed to merging), and if
     neither the working directory nor the target rev has the file,
     then we need to remove it from the dirstate, to prevent the
     dirstate from listing the file when it is no longer in the
     manifest.
     """
 
     action = []
 
     for f in wctx.deleted() + wctx.removed():
         if f not in m2:
             action.append((f, "f"))
 
     return action
 
 def nonoverlap(d1, d2):
     """
     Return list of elements in d1 not in d2
     """
 
     l = []
     for d in d1:
         if d not in d2:
             l.append(d)
 
     l.sort()
     return l
 
 def findold(fctx, limit):
     """
     find files that path was copied from, back to linkrev limit
     """
 
     old = {}
     orig = fctx.path()
     visit = [fctx]
     while visit:
         fc = visit.pop()
         if fc.rev() < limit:
             continue
         if fc.path() != orig and fc.path() not in old:
             old[fc.path()] = 1
         visit += fc.parents()
 
     old = old.keys()
     old.sort()
     return old
 
 def findcopies(repo, m1, m2, limit):
     """
     Find moves and copies between m1 and m2 back to limit linkrev
     """
 
     if not repo.ui.config("merge", "followcopies"):
         return {}
 
     # avoid silly behavior for update from empty dir
     if not m1:
         return {}
 
     dcopies = repo.dirstate.copies()
     copy = {}
     match = {}
     u1 = nonoverlap(m1, m2)
     u2 = nonoverlap(m2, m1)
     ctx = util.cachefunc(lambda f,n: repo.filectx(f, fileid=n[:20]))
 
     def checkpair(c, f2, man):
         ''' check if an apparent pair actually matches '''
         c2 = ctx(f2, man[f2])
         ca = c.ancestor(c2)
         if ca and ca.path() == c.path() or ca.path() == c2.path():
             copy[c.path()] = f2
             copy[f2] = c.path()
 
     for f in u1:
         c = ctx(dcopies.get(f, f), m1[f])
         for of in findold(c, limit):
             if of in m2:
                 checkpair(c, of, m2)
             else:
                 match.setdefault(of, []).append(f)
 
     for f in u2:
         c = ctx(f, m2[f])
         for of in findold(c, limit):
             if of in m1:
                 checkpair(c, of, m1)
             elif of in match:
                 for mf in match[of]:
                     checkpair(c, mf, m1)
 
     return copy
 
 def manifestmerge(repo, p1, p2, pa, overwrite, partial):
     """
     Merge manifest m1 with m2 using ancestor ma and generate merge action list
     """
 
     m1 = p1.manifest()
     m2 = p2.manifest()
     ma = pa.manifest()
     backwards = (pa == p2)
 
     def fmerge(f, f2=None, fa=None):
         """merge executable flags"""
         if not f2:
             f2 = f
             fa = f
         a, b, c = ma.execf(fa), m1.execf(f), m2.execf(f2)
         return ((a^b) | (a^c)) ^ a
 
     action = []
 
     def act(msg, m, f, *args):
         repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
         action.append((f, m) + args)
 
     copy = {}
     if not (backwards or overwrite):
         copy = findcopies(repo, m1, m2, pa.rev())
 
     # Compare manifests
     for f, n in m1.iteritems():
         if partial and not partial(f):
             continue
         if f in m2:
             # are files different?
             if n != m2[f]:
                 a = ma.get(f, nullid)
                 # are both different from the ancestor?
                 if not overwrite and n != a and m2[f] != a:
-                    act("versions differ", "m", f, fmerge(f))
+                    act("versions differ", "m", f, f, f, fmerge(f), False)
                 # are we clobbering?
                 # is remote's version newer?
                 # or are we going back in time and clean?
                 elif overwrite or m2[f] != a or (backwards and not n[20:]):
                     act("remote is newer", "g", f, m2.execf(f))
                 # local is newer, not overwrite, check mode bits
                 elif fmerge(f) != m1.execf(f):
                     act("update permissions", "e", f, m2.execf(f))
             # contents same, check mode bits
             elif m1.execf(f) != m2.execf(f):
                 if overwrite or fmerge(f) != m1.execf(f):
                     act("update permissions", "e", f, m2.execf(f))
         elif f in copy:
             f2 = copy[f]
             if f in ma: # case 3,20 A/B/A
-                act("remote moved", "c",
-                    f, f2, f2, fmerge(f, f2, f), True)
+                act("remote moved", "m", f, f2, f2, fmerge(f, f2, f), True)
             else:
                 if f2 in m1: # case 2 A,B/B/B
-                    act("local copied", "c",
+                    act("local copied", "m",
                         f, f2, f, fmerge(f, f2, f2), False)
                 else: # case 4,21 A/B/B
-                    act("local moved", "c",
+                    act("local moved", "m",
                         f, f2, f, fmerge(f, f2, f2), False)
         elif f in ma:
             if n != ma[f] and not overwrite:
                 if repo.ui.prompt(
                     (_(" local changed %s which remote deleted\n") % f) +
                     _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("d"):
                     act("prompt delete", "r", f)
             else:
                 act("other deleted", "r", f)
         else:
             # file is created on branch or in working directory
             if (overwrite and n[20:] != "u") or (backwards and not n[20:]):
                 act("remote deleted", "r", f)
 
     for f, n in m2.iteritems():
         if partial and not partial(f):
             continue
         if f in m1:
             continue
         if f in copy:
             f2 = copy[f]
             if f2 not in m2: # already seen
                 continue
             # rename case 1, A/A,B/A
-            act("remote copied", "c", f2, f, f, fmerge(f2, f, f2), False)
+            act("remote copied", "m", f2, f, f, fmerge(f2, f, f2), False)
         elif f in ma:
             if overwrite or backwards:
                 act("recreating", "g", f, m2.execf(f))
             elif n != ma[f]:
                 if repo.ui.prompt(
                     (_("remote changed %s which local deleted\n") % f) +
                     _("(k)eep or (d)elete?"), _("[kd]"), _("k")) == _("k"):
                     act("prompt recreating", "g", f, m2.execf(f))
         else:
             act("remote created", "g", f, m2.execf(f))
 
     return action
 
 def applyupdates(repo, action, wctx, mctx):
     updated, merged, removed, unresolved = 0, 0, 0, 0
     action.sort()
     for a in action:
         f, m = a[:2]
         if f[0] == "/":
             continue
         if m == "r": # remove
             repo.ui.note(_("removing %s\n") % f)
             util.audit_path(f)
             try:
                 util.unlink(repo.wjoin(f))
             except OSError, inst:
                 if inst.errno != errno.ENOENT:
                     repo.ui.warn(_("update failed to remove %s: %s!\n") %
                                  (f, inst.strerror))
             removed +=1
-        elif m == "c": # copy
+        elif m == "m": # merge
             f2, fd, flag, move = a[2:]
-            repo.ui.status(_("merging %s and %s to %s\n") % (f, f2, fd))
+            if f != f2:
+                repo.ui.status(_("merging %s and %s to %s\n") % (f, f2, fd))
+            else:
+                repo.ui.status(_("merging %s\n") % f)
             if filemerge(repo, f, f2, fd, wctx, mctx, move):
                 unresolved += 1
             util.set_exec(repo.wjoin(fd), flag)
             merged += 1
-        elif m == "m": # merge
-            flag = a[2]
-            repo.ui.status(_("merging %s\n") % f)
-            if filemerge(repo, f, f, f, wctx, mctx, False):
-                unresolved += 1
-            util.set_exec(repo.wjoin(f), flag)
-            merged += 1
         elif m == "g": # get
             flag = a[2]
             repo.ui.note(_("getting %s\n") % f)
             t = mctx.filectx(f).data()
             repo.wwrite(f, t)
             util.set_exec(repo.wjoin(f), flag)
             updated += 1
         elif m == "e": # exec
             flag = a[2]
             util.set_exec(repo.wjoin(f), flag)
 
     return updated, merged, removed, unresolved
 
 def recordupdates(repo, action, branchmerge, mctx):
     for a in action:
         f, m = a[:2]
         if m == "r": # remove
             if branchmerge:
                 repo.dirstate.update([f], 'r')
             else:
                 repo.dirstate.forget([f])
         elif m == "f": # forget
             repo.dirstate.forget([f])
         elif m == "g": # get
             if branchmerge:
                 repo.dirstate.update([f], 'n', st_mtime=-1)
             else:
                 repo.dirstate.update([f], 'n')
         elif m == "m": # merge
-            flag = a[2]
-            if branchmerge:
-                # We've done a branch merge, mark this file as merged
-                # so that we properly record the merger later
-                repo.dirstate.update([f], 'm')
-            else:
-                # We've update-merged a locally modified file, so
-                # we set the dirstate to emulate a normal checkout
-                # of that file some time in the past. Thus our
-                # merge will appear as a normal local file
-                # modification.
-                fl = repo.file(f)
-                f_len = mctx.filectx(f).size()
-                repo.dirstate.update([f], 'n', st_size=f_len, st_mtime=-1)
-        elif m == "c": # copy
             f2, fd, flag, move = a[2:]
             if branchmerge:
                 # We've done a branch merge, mark this file as merged
                 # so that we properly record the merger later
                 repo.dirstate.update([fd], 'm')
             else:
                 # We've update-merged a locally modified file, so
                 # we set the dirstate to emulate a normal checkout
                 # of that file some time in the past. Thus our
                 # merge will appear as a normal local file
                 # modification.
-                fl = repo.file(f)
                 f_len = mctx.filectx(f).size()
                 repo.dirstate.update([fd], 'n', st_size=f_len, st_mtime=-1)
-            if move:
-                repo.dirstate.update([f], 'r')
-            if f != fd:
-                repo.dirstate.copy(f, fd)
-            else:
-                repo.dirstate.copy(f2, fd)
+            if f != f2: # copy/rename
+                if move:
+                    repo.dirstate.update([f], 'r')
+                if f != fd:
+                    repo.dirstate.copy(f, fd)
+                else:
+                    repo.dirstate.copy(f2, fd)
 
 def update(repo, node, branchmerge=False, force=False, partial=None,
            wlock=None, show_stats=True, remind=True):
 
     overwrite = force and not branchmerge
     forcemerge = force and branchmerge
 
     if not wlock:
         wlock = repo.wlock()
 
     ### check phase
 
     wc = repo.workingctx()
     pl = wc.parents()
     if not overwrite and len(pl) > 1:
         raise util.Abort(_("outstanding uncommitted merges"))
 
     p1, p2 = pl[0], repo.changectx(node)
     pa = p1.ancestor(p2)
 
     # is there a linear path from p1 to p2?
     if pa == p1 or pa == p2:
         if branchmerge:
             raise util.Abort(_("there is nothing to merge, just use "
                                "'hg update' or look at 'hg heads'"))
     elif not (overwrite or branchmerge):
         raise util.Abort(_("update spans branches, use 'hg merge' "
                            "or 'hg update -C' to lose changes"))
 
     if branchmerge and not forcemerge:
         if wc.modified() or wc.added() or wc.removed():
             raise util.Abort(_("outstanding uncommitted changes"))
 
     m1 = wc.manifest()
     m2 = p2.manifest()
 
     # resolve the manifest to determine which files
     # we care about merging
     repo.ui.note(_("resolving manifests\n"))
     repo.ui.debug(_(" overwrite %s branchmerge %s partial %s\n") %
                   (overwrite, branchmerge, bool(partial)))
     repo.ui.debug(_(" ancestor %s local %s remote %s\n") % (p1, p2, pa))
 
     action = []
 
     if not force:
         checkunknown(repo, m2, wc)
     if not branchmerge:
         action += forgetremoved(m2, wc)
 
     action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
 
     ### apply phase
 
     if not branchmerge:
         # just jump to the new rev
         fp1, fp2, xp1, xp2 = p2.node(), nullid, str(p2), ''
     else:
         fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
 
     if not partial:
         repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
 
     updated, merged, removed, unresolved = applyupdates(repo, action, wc, p2)
 
     # update dirstate
     if not partial:
         recordupdates(repo, action, branchmerge, p2)
         repo.dirstate.setparents(fp1, fp2)
         repo.hook('update', parent1=xp1, parent2=xp2, error=unresolved)
 
     if show_stats:
         stats = ((updated, _("updated")),
                  (merged - unresolved, _("merged")),
                  (removed, _("removed")),
                  (unresolved, _("unresolved")))
         note = ", ".join([_("%d files %s") % s for s in stats])
         repo.ui.status("%s\n" % note)
     if not partial:
         if branchmerge:
             if unresolved:
                 repo.ui.status(_("There are unresolved merges,"
                                 " you can redo the full merge using:\n"
                                 "  hg update -C %s\n"
                                 "  hg merge %s\n"
                                 % (p1.rev(), p2.rev())))
             elif remind:
                 repo.ui.status(_("(branch merge, don't forget to commit)\n"))
         elif unresolved:
             repo.ui.status(_("There are unresolved merges with"
                              " locally modified files.\n"))
 
     return unresolved
 

tests/test-rename-merge1.out

@@ -1,26 +1,26 b''
 checkout
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 merge
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor f26ec4fc3fa3 local 8e765a822af2 remote af1939970a1c
- a: remote moved -> c
+ a: remote moved -> m
  b2: remote created -> g
 merging a and b to b
 resolving a
 my a@. other b@8e765a822af2 ancestor a@af1939970a1c
 copying a to b
 removing a
 getting b2
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 M b
   a
 M b2
 R a
 C c2
 blahblah
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      67      0       1 dc51707dfc98 000000000000 000000000000
      1        67      72      1       3 b2494a44f0a9 000000000000 dc51707dfc98
 renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66

tests/test-rename-merge2.out

@@ -1,463 +1,463 b''
 --------------
 test L:up a   R:nc a b W:       - 1  get local a to b
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor e300d1c794ec local 735846fee2d7 remote 924404dff337
  rev: versions differ -> m
- a: remote copied -> c
+ a: remote copied -> m
 merging a and b to b
 resolving a
 my a@. other b@735846fee2d7 ancestor a@924404dff337
 copying a to b
 merging rev
 resolving rev
 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
   a
 --------------
 
 --------------
 test L:nc a b R:up a   W:       - 2  get rem change to a and b
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ac809aeed39a local f4db7e329e71 remote 924404dff337
  a: remote is newer -> g
- b: local copied -> c
+ b: local copied -> m
  rev: versions differ -> m
 getting a
 merging b and a to b
 resolving b
 my b@. other a@f4db7e329e71 ancestor a@924404dff337
 merging rev
 resolving rev
 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
   a
 --------------
 
 --------------
 test L:up a   R:nm a b W:       - 3  get local a change to b, remove a
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor e300d1c794ec local e03727d2d66b remote 924404dff337
- a: remote moved -> c
+ a: remote moved -> m
  rev: versions differ -> m
 merging a and b to b
 resolving a
 my a@. other b@e03727d2d66b ancestor a@924404dff337
 copying a to b
 removing a
 merging rev
 resolving rev
 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 --------------
 test L:nm a b R:up a   W:       - 4  get remote change to b
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ecf3cb2a4219 local f4db7e329e71 remote 924404dff337
- b: local moved -> c
+ b: local moved -> m
  rev: versions differ -> m
 merging b and a to b
 resolving b
 my b@. other a@f4db7e329e71 ancestor a@924404dff337
 merging rev
 resolving rev
 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 --------------
 test L:       R:nc a b W:       - 5  get b
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor 94b33a1b7f2d local 735846fee2d7 remote 924404dff337
  rev: versions differ -> m
- a: remote copied -> c
+ a: remote copied -> m
 merging a and b to b
 resolving a
 my a@. other b@735846fee2d7 ancestor a@924404dff337
 copying a to b
 merging rev
 resolving rev
 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
   a
 --------------
 
 --------------
 test L:nc a b R:       W:       - 6  nothing
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ac809aeed39a local 97c705ade336 remote 924404dff337
- b: local copied -> c
+ b: local copied -> m
  rev: versions differ -> m
 merging b and a to b
 resolving b
 my b@. other a@97c705ade336 ancestor a@924404dff337
 merging rev
 resolving rev
 my rev@. other rev@97c705ade336 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 C a
 --------------
 
 --------------
 test L:       R:nm a b W:       - 7  get b
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor 94b33a1b7f2d local e03727d2d66b remote 924404dff337
- a: remote moved -> c
+ a: remote moved -> m
  rev: versions differ -> m
 merging a and b to b
 resolving a
 my a@. other b@e03727d2d66b ancestor a@924404dff337
 copying a to b
 removing a
 merging rev
 resolving rev
 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 --------------
 test L:nm a b R:       W:       - 8  nothing
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ecf3cb2a4219 local 97c705ade336 remote 924404dff337
- b: local moved -> c
+ b: local moved -> m
  rev: versions differ -> m
 merging b and a to b
 resolving b
 my b@. other a@97c705ade336 ancestor a@924404dff337
 merging rev
 resolving rev
 my rev@. other rev@97c705ade336 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 --------------
 test L:um a b R:um a b W:       - 9  do merge with ancestor in a
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ec03c2ca8642 local 79cc6877a3b7 remote 924404dff337
  b: versions differ -> m
  rev: versions differ -> m
 merging b
 resolving b
 my b@. other b@79cc6877a3b7 ancestor a@924404dff337
 merging rev
 resolving rev
 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 --------------
 
 --------------
 test L:nm a b R:nm a c W:       - 11 get c, keep b
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ecf3cb2a4219 local e6abcc1a30c2 remote 924404dff337
  rev: versions differ -> m
  c: remote created -> g
 getting c
 merging rev
 resolving rev
 my rev@. other rev@e6abcc1a30c2 ancestor rev@924404dff337
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M c
 C b
 --------------
 
 --------------
 test L:nc a b R:up b   W:       - 12 merge b no ancestor
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ac809aeed39a local af30c7647fc7 remote 924404dff337
  b: versions differ -> m
  rev: versions differ -> m
 merging b
 resolving b
 my b@. other b@af30c7647fc7 ancestor b@000000000000
 merging rev
 resolving rev
 my rev@. other rev@af30c7647fc7 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 C a
 --------------
 
 --------------
 test L:up b   R:nm a b W:       - 13 merge b no ancestor
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor 59318016310c local e03727d2d66b remote 924404dff337
  a: other deleted -> r
  b: versions differ -> m
  rev: versions differ -> m
 removing a
 merging b
 resolving b
 my b@. other b@e03727d2d66b ancestor b@000000000000
 merging rev
 resolving rev
 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 --------------
 
 --------------
 test L:nc a b R:up a b W:       - 14 merge b no ancestor
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ac809aeed39a local 8dbce441892a remote 924404dff337
  a: remote is newer -> g
  b: versions differ -> m
  rev: versions differ -> m
 getting a
 merging b
 resolving b
 my b@. other b@8dbce441892a ancestor b@000000000000
 merging rev
 resolving rev
 my rev@. other rev@8dbce441892a ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
 --------------
 
 --------------
 test L:up b   R:nm a b W:       - 15 merge b no ancestor, remove a
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor 59318016310c local e03727d2d66b remote 924404dff337
  a: other deleted -> r
  b: versions differ -> m
  rev: versions differ -> m
 removing a
 merging b
 resolving b
 my b@. other b@e03727d2d66b ancestor b@000000000000
 merging rev
 resolving rev
 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 --------------
 
 --------------
 test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ac809aeed39a local 8dbce441892a remote 924404dff337
  a: remote is newer -> g
  b: versions differ -> m
  rev: versions differ -> m
 getting a
 merging b
 resolving b
 my b@. other b@8dbce441892a ancestor b@000000000000
 merging rev
 resolving rev
 my rev@. other rev@8dbce441892a ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
 --------------
 
 --------------
 test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor 0b76e65c8289 local 735846fee2d7 remote 924404dff337
  b: versions differ -> m
  rev: versions differ -> m
 merging b
 resolving b
 my b@. other b@735846fee2d7 ancestor b@000000000000
 merging rev
 resolving rev
 my rev@. other rev@735846fee2d7 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 C a
 --------------
 
 --------------
 test L:nm a b R:up a b W:       - 18 merge b no ancestor
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ecf3cb2a4219 local 8dbce441892a remote 924404dff337
  b: versions differ -> m
  rev: versions differ -> m
  a: prompt recreating -> g
 getting a
 merging b
 resolving b
 my b@. other b@8dbce441892a ancestor b@000000000000
 merging rev
 resolving rev
 my rev@. other rev@8dbce441892a ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M a
 M b
 --------------
 
 --------------
 test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor 0b76e65c8289 local e03727d2d66b remote 924404dff337
  b: versions differ -> m
  rev: versions differ -> m
 merging b
 resolving b
 my b@. other b@e03727d2d66b ancestor b@000000000000
 merging rev
 resolving rev
 my rev@. other rev@e03727d2d66b ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 C a
 --------------
 
 --------------
 test L:up a   R:um a b W:       - 20 merge a and b to b, remove a
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor e300d1c794ec local 79cc6877a3b7 remote 924404dff337
- a: remote moved -> c
+ a: remote moved -> m
  rev: versions differ -> m
 merging a and b to b
 resolving a
 my a@. other b@79cc6877a3b7 ancestor a@924404dff337
 copying a to b
 removing a
 merging rev
 resolving rev
 my rev@. other rev@79cc6877a3b7 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 --------------
 test L:um a b R:up a   W:       - 21 merge a and b to b
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ec03c2ca8642 local f4db7e329e71 remote 924404dff337
- b: local moved -> c
+ b: local moved -> m
  rev: versions differ -> m
 merging b and a to b
 resolving b
 my b@. other a@f4db7e329e71 ancestor a@924404dff337
 merging rev
 resolving rev
 my rev@. other rev@f4db7e329e71 ancestor rev@924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 --------------
 
 --------------
 test L:nm a b R:up a c W:       - 23 get c, keep b
 --------------
 resolving manifests
  overwrite None branchmerge True partial False
  ancestor ecf3cb2a4219 local 2b958612230f remote 924404dff337
- b: local moved -> c
+ b: local moved -> m
  rev: versions differ -> m
  c: remote created -> g
 merging b and a to b
 resolving b
 my b@. other a@2b958612230f ancestor a@924404dff337
 getting c
 merging rev
 resolving rev
 my rev@. other rev@2b958612230f ancestor rev@924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
   a
 M c
 --------------