update: make calls to ui.progress()

mercurial/merge.py

@@ -1,514 +1,518 b''
 # merge.py - directory-level update/merge handling for Mercurial
 #
 # Copyright 2006, 2007 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 node import nullid, nullrev, hex, bin
 from i18n import _
 import util, filemerge, copies, subrepo
 import errno, os, shutil
 
 class mergestate(object):
     '''track 3-way merge state of individual files'''
     def __init__(self, repo):
         self._repo = repo
         self._read()
     def reset(self, node=None):
         self._state = {}
         if node:
             self._local = node
         shutil.rmtree(self._repo.join("merge"), True)
     def _read(self):
         self._state = {}
         try:
             localnode = None
             f = self._repo.opener("merge/state")
             for i, l in enumerate(f):
                 if i == 0:
                     localnode = l[:-1]
                 else:
                     bits = l[:-1].split("\0")
                     self._state[bits[0]] = bits[1:]
             self._local = bin(localnode)
         except IOError, err:
             if err.errno != errno.ENOENT:
                 raise
     def _write(self):
         f = self._repo.opener("merge/state", "w")
         f.write(hex(self._local) + "\n")
         for d, v in self._state.iteritems():
             f.write("\0".join([d] + v) + "\n")
     def add(self, fcl, fco, fca, fd, flags):
         hash = util.sha1(fcl.path()).hexdigest()
         self._repo.opener("merge/" + hash, "w").write(fcl.data())
         self._state[fd] = ['u', hash, fcl.path(), fca.path(),
                            hex(fca.filenode()), fco.path(), flags]
         self._write()
     def __contains__(self, dfile):
         return dfile in self._state
     def __getitem__(self, dfile):
         return self._state[dfile][0]
     def __iter__(self):
         l = self._state.keys()
         l.sort()
         for f in l:
             yield f
     def mark(self, dfile, state):
         self._state[dfile][0] = state
         self._write()
     def resolve(self, dfile, wctx, octx):
         if self[dfile] == 'r':
             return 0
         state, hash, lfile, afile, anode, ofile, flags = self._state[dfile]
         f = self._repo.opener("merge/" + hash)
         self._repo.wwrite(dfile, f.read(), flags)
         fcd = wctx[dfile]
         fco = octx[ofile]
         fca = self._repo.filectx(afile, fileid=anode)
         r = filemerge.filemerge(self._repo, self._local, lfile, fcd, fco, fca)
         if not r:
             self.mark(dfile, 'r')
         return r
 
 def _checkunknown(wctx, mctx):
     "check for collisions between unknown files and files in mctx"
     for f in wctx.unknown():
         if f in mctx and mctx[f].cmp(wctx[f].data()):
             raise util.Abort(_("untracked file in working directory differs"
                                " from file in requested revision: '%s'") % f)
 
 def _checkcollision(mctx):
     "check for case folding collisions in the destination context"
     folded = {}
     for fn in mctx:
         fold = fn.lower()
         if fold in folded:
             raise util.Abort(_("case-folding collision between %s and %s")
                              % (fn, folded[fold]))
         folded[fold] = fn
 
 def _forgetremoved(wctx, mctx, branchmerge):
     """
     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.
 
     If we're merging, and the other revision has removed a file
     that is not present in the working directory, we need to mark it
     as removed.
     """
 
     action = []
     state = branchmerge and 'r' or 'f'
     for f in wctx.deleted():
         if f not in mctx:
             action.append((f, state))
 
     if not branchmerge:
         for f in wctx.removed():
             if f not in mctx:
                 action.append((f, "f"))
 
     return action
 
 def manifestmerge(repo, p1, p2, pa, overwrite, partial):
     """
     Merge p1 and p2 with ancestor ma and generate merge action list
 
     overwrite = whether we clobber working files
     partial = function to filter file lists
     """
 
     def fmerge(f, f2, fa):
         """merge flags"""
         a, m, n = ma.flags(fa), m1.flags(f), m2.flags(f2)
         if m == n: # flags agree
             return m # unchanged
         if m and n and not a: # flags set, don't agree, differ from parent
             r = repo.ui.promptchoice(
                 _(" conflicting flags for %s\n"
                   "(n)one, e(x)ec or sym(l)ink?") % f,
                 (_("&None"), _("E&xec"), _("Sym&link")), 0)
             if r == 1:
                 return "x" # Exec
             if r == 2:
                 return "l" # Symlink
             return ""
         if m and m != a: # changed from a to m
             return m
         if n and n != a: # changed from a to n
             return n
         return '' # flag was cleared
 
     def act(msg, m, f, *args):
         repo.ui.debug(" %s: %s -> %s\n" % (f, msg, m))
         action.append((f, m) + args)
 
     action, copy = [], {}
 
     if overwrite:
         pa = p1
     elif pa == p2: # backwards
         pa = p1.p1()
     elif pa and repo.ui.configbool("merge", "followcopies", True):
         dirs = repo.ui.configbool("merge", "followdirs", True)
         copy, diverge = copies.copies(repo, p1, p2, pa, dirs)
         for of, fl in diverge.iteritems():
             act("divergent renames", "dr", of, fl)
 
     repo.ui.note(_("resolving manifests\n"))
     repo.ui.debug(" overwrite %s partial %s\n" % (overwrite, bool(partial)))
     repo.ui.debug(" ancestor %s local %s remote %s\n" % (pa, p1, p2))
 
     m1, m2, ma = p1.manifest(), p2.manifest(), pa.manifest()
     copied = set(copy.values())
 
     if not overwrite and '.hgsubstate' in m1:
         # check whether sub state is modified
         for s in p1.substate:
             if p1.sub(s).dirty():
                 m1['.hgsubstate'] += "+"
                 break
 
     # Compare manifests
     for f, n in m1.iteritems():
         if partial and not partial(f):
             continue
         if f in m2:
             rflags = fmerge(f, f, f)
             a = ma.get(f, nullid)
             if n == m2[f] or m2[f] == a: # same or local newer
                 if m1.flags(f) != rflags:
                     act("update permissions", "e", f, rflags)
             elif n == a: # remote newer
                 act("remote is newer", "g", f, rflags)
             else: # both changed
                 act("versions differ", "m", f, f, f, rflags, False)
         elif f in copied: # files we'll deal with on m2 side
             pass
         elif f in copy:
             f2 = copy[f]
             if f2 not in m2: # directory rename
                 act("remote renamed directory to " + f2, "d",
                     f, None, f2, m1.flags(f))
             else: # case 2 A,B/B/B or case 4,21 A/B/B
                 act("local copied/moved to " + f2, "m",
                     f, f2, f, fmerge(f, f2, f2), False)
         elif f in ma: # clean, a different, no remote
             if n != ma[f]:
                 if repo.ui.promptchoice(
                     _(" local changed %s which remote deleted\n"
                       "use (c)hanged version or (d)elete?") % f,
                     (_("&Changed"), _("&Delete")), 0):
                     act("prompt delete", "r", f)
                 else:
                     act("prompt keep", "a", f)
             elif n[20:] == "a": # added, no remote
                 act("remote deleted", "f", f)
             elif n[20:] != "u":
                 act("other deleted", "r", f)
 
     for f, n in m2.iteritems():
         if partial and not partial(f):
             continue
         if f in m1 or f in copied: # files already visited
             continue
         if f in copy:
             f2 = copy[f]
             if f2 not in m1: # directory rename
                 act("local renamed directory to " + f2, "d",
                     None, f, f2, m2.flags(f))
             elif f2 in m2: # rename case 1, A/A,B/A
                 act("remote copied to " + f, "m",
                     f2, f, f, fmerge(f2, f, f2), False)
             else: # case 3,20 A/B/A
                 act("remote moved to " + f, "m",
                     f2, f, f, fmerge(f2, f, f2), True)
         elif f not in ma:
             act("remote created", "g", f, m2.flags(f))
         elif n != ma[f]:
             if repo.ui.promptchoice(
                 _("remote changed %s which local deleted\n"
                   "use (c)hanged version or leave (d)eleted?") % f,
                 (_("&Changed"), _("&Deleted")), 0) == 0:
                 act("prompt recreating", "g", f, m2.flags(f))
 
     return action
 
 def actionkey(a):
     return a[1] == 'r' and -1 or 0, a
 
 def applyupdates(repo, action, wctx, mctx):
     "apply the merge action list to the working directory"
 
     updated, merged, removed, unresolved = 0, 0, 0, 0
     ms = mergestate(repo)
     ms.reset(wctx.parents()[0].node())
     moves = []
     action.sort(key=actionkey)
     substate = wctx.substate # prime
 
     # prescan for merges
+    u = repo.ui
     for a in action:
         f, m = a[:2]
         if m == 'm': # merge
             f2, fd, flags, move = a[2:]
             if f == '.hgsubstate': # merged internally
                 continue
             repo.ui.debug("preserving %s for resolve of %s\n" % (f, fd))
             fcl = wctx[f]
             fco = mctx[f2]
             fca = fcl.ancestor(fco) or repo.filectx(f, fileid=nullrev)
             ms.add(fcl, fco, fca, fd, flags)
             if f != fd and move:
                 moves.append(f)
 
     # remove renamed files after safely stored
     for f in moves:
         if util.lexists(repo.wjoin(f)):
             repo.ui.debug("removing %s\n" % f)
             os.unlink(repo.wjoin(f))
 
     audit_path = util.path_auditor(repo.root)
 
-    for a in action:
+    numupdates = len(action)
+    for i, a in enumerate(action):
         f, m = a[:2]
+        u.progress('update', i + 1, item=f, total=numupdates, unit='files')
         if f and f[0] == "/":
             continue
         if m == "r": # remove
             repo.ui.note(_("removing %s\n") % f)
             audit_path(f)
             if f == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx)
             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 == "m": # merge
             if f == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx))
                 continue
             f2, fd, flags, move = a[2:]
             r = ms.resolve(fd, wctx, mctx)
             if r is not None and r > 0:
                 unresolved += 1
             else:
                 if r is None:
                     updated += 1
                 else:
                     merged += 1
             util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags)
             if f != fd and move and util.lexists(repo.wjoin(f)):
                 repo.ui.debug("removing %s\n" % f)
                 os.unlink(repo.wjoin(f))
         elif m == "g": # get
             flags = a[2]
             repo.ui.note(_("getting %s\n") % f)
             t = mctx.filectx(f).data()
             repo.wwrite(f, t, flags)
             updated += 1
             if f == '.hgsubstate': # subrepo states need updating
                 subrepo.submerge(repo, wctx, mctx, wctx)
         elif m == "d": # directory rename
             f2, fd, flags = a[2:]
             if f:
                 repo.ui.note(_("moving %s to %s\n") % (f, fd))
                 t = wctx.filectx(f).data()
                 repo.wwrite(fd, t, flags)
                 util.unlink(repo.wjoin(f))
             if f2:
                 repo.ui.note(_("getting %s to %s\n") % (f2, fd))
                 t = mctx.filectx(f2).data()
                 repo.wwrite(fd, t, flags)
             updated += 1
         elif m == "dr": # divergent renames
             fl = a[2]
             repo.ui.warn(_("warning: detected divergent renames of %s to:\n") % f)
             for nf in fl:
                 repo.ui.warn(" %s\n" % nf)
         elif m == "e": # exec
             flags = a[2]
             util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags)
+    u.progress('update', None, total=numupdates, unit='files')
 
     return updated, merged, removed, unresolved
 
 def recordupdates(repo, action, branchmerge):
     "record merge actions to the dirstate"
 
     for a in action:
         f, m = a[:2]
         if m == "r": # remove
             if branchmerge:
                 repo.dirstate.remove(f)
             else:
                 repo.dirstate.forget(f)
         elif m == "a": # re-add
             if not branchmerge:
                 repo.dirstate.add(f)
         elif m == "f": # forget
             repo.dirstate.forget(f)
         elif m == "e": # exec change
             repo.dirstate.normallookup(f)
         elif m == "g": # get
             if branchmerge:
                 repo.dirstate.normaldirty(f)
             else:
                 repo.dirstate.normal(f)
         elif m == "m": # merge
             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.merge(fd)
                 if f != f2: # copy/rename
                     if move:
                         repo.dirstate.remove(f)
                     if f != fd:
                         repo.dirstate.copy(f, fd)
                     else:
                         repo.dirstate.copy(f2, fd)
             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.
                 repo.dirstate.normallookup(fd)
                 if move:
                     repo.dirstate.forget(f)
         elif m == "d": # directory rename
             f2, fd, flag = a[2:]
             if not f2 and f not in repo.dirstate:
                 # untracked file moved
                 continue
             if branchmerge:
                 repo.dirstate.add(fd)
                 if f:
                     repo.dirstate.remove(f)
                     repo.dirstate.copy(f, fd)
                 if f2:
                     repo.dirstate.copy(f2, fd)
             else:
                 repo.dirstate.normal(fd)
                 if f:
                     repo.dirstate.forget(f)
 
 def update(repo, node, branchmerge, force, partial):
     """
     Perform a merge between the working directory and the given node
 
     node = the node to update to, or None if unspecified
     branchmerge = whether to merge between branches
     force = whether to force branch merging or file overwriting
     partial = a function to filter file lists (dirstate not updated)
 
     The table below shows all the behaviors of the update command
     given the -c and -C or no options, whether the working directory
     is dirty, whether a revision is specified, and the relationship of
     the parent rev to the target rev (linear, on the same named
     branch, or on another named branch).
 
     This logic is tested by test-update-branches.
 
     -c  -C  dirty  rev  |  linear   same  cross
      n   n    n     n   |    ok     (1)     x
      n   n    n     y   |    ok     ok     ok
      n   n    y     *   |   merge   (2)    (2)
      n   y    *     *   |    ---  discard  ---
      y   n    y     *   |    ---    (3)    ---
      y   n    n     *   |    ---    ok     ---
      y   y    *     *   |    ---    (4)    ---
 
     x = can't happen
     * = don't-care
     1 = abort: crosses branches (use 'hg merge' or 'hg update -c')
     2 = abort: crosses branches (use 'hg merge' to merge or
                  use 'hg update -C' to discard changes)
     3 = abort: uncommitted local changes
     4 = incompatible options (checked in commands.py)
     """
 
     onode = node
     wlock = repo.wlock()
     try:
         wc = repo[None]
         if node is None:
             # tip of current branch
             try:
                 node = repo.branchtags()[wc.branch()]
             except KeyError:
                 if wc.branch() == "default": # no default branch!
                     node = repo.lookup("tip") # update to tip
                 else:
                     raise util.Abort(_("branch %s not found") % wc.branch())
         overwrite = force and not branchmerge
         pl = wc.parents()
         p1, p2 = pl[0], repo[node]
         pa = p1.ancestor(p2)
         fp1, fp2, xp1, xp2 = p1.node(), p2.node(), str(p1), str(p2)
         fastforward = False
 
         ### check phase
         if not overwrite and len(pl) > 1:
             raise util.Abort(_("outstanding uncommitted merges"))
         if branchmerge:
             if pa == p2:
                 raise util.Abort(_("can't merge with ancestor"))
             elif pa == p1:
                 if p1.branch() != p2.branch():
                     fastforward = True
                 else:
                     raise util.Abort(_("nothing to merge (use 'hg update'"
                                        " or check 'hg heads')"))
             if not force and (wc.files() or wc.deleted()):
                 raise util.Abort(_("outstanding uncommitted changes "
                                    "(use 'hg status' to list changes)"))
         elif not overwrite:
             if pa == p1 or pa == p2: # linear
                 pass # all good
             elif wc.files() or wc.deleted():
                 raise util.Abort(_("crosses branches (use 'hg merge' to merge "
                                  "or use 'hg update -C' to discard changes)"))
             elif onode is None:
                 raise util.Abort(_("crosses branches (use 'hg merge' or use "
                                    "'hg update -c')"))
             else:
                 # Allow jumping branches if clean and specific rev given
                 overwrite = True
 
         ### calculate phase
         action = []
         if not force:
             _checkunknown(wc, p2)
         if not util.checkcase(repo.path):
             _checkcollision(p2)
         action += _forgetremoved(wc, p2, branchmerge)
         action += manifestmerge(repo, wc, p2, pa, overwrite, partial)
 
         ### apply phase
         if not branchmerge: # just jump to the new rev
             fp1, fp2, xp1, xp2 = fp2, nullid, xp2, ''
         if not partial:
             repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
 
         stats = applyupdates(repo, action, wc, p2)
 
         if not partial:
             recordupdates(repo, action, branchmerge)
             repo.dirstate.setparents(fp1, fp2)
             if not branchmerge and not fastforward:
                 repo.dirstate.setbranch(p2.branch())
             repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3])
 
         return stats
     finally:
         wlock.release()

tests/test-copy-move-merge.out

@@ -1,35 +1,37 b''
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in other:
    b
    c
   all copies found (* = to merge, ! = divergent):
    c -> a *
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
  a: remote moved to c -> m
  a: remote moved to b -> m
 preserving a for resolve of b
 preserving a for resolve of c
 removing a
+update: a 1/2 files (50.00%)
 picked tool 'internal:merge' for b (binary False symlink False)
 merging a and b to b
 my b@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052
  premerge successful
+update: a 2/2 files (100.00%)
 picked tool 'internal:merge' for c (binary False symlink False)
 merging a and c to c
 my c@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052
  premerge successful
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 -- b --
 0
 1
 2
 -- c --
 0
 1
 2

tests/test-double-merge.out

@@ -1,37 +1,39 b''
 created new head
 changeset:   1:7731dad1c2b9
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     cp foo bar; change both
 
   searching for copies back to rev 1
   unmatched files in other:
    bar
   all copies found (* = to merge, ! = divergent):
    bar -> foo *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 310fd17130da local 2092631ce82b+ remote 7731dad1c2b9
  foo: versions differ -> m
  foo: remote copied to bar -> m
 preserving foo for resolve of bar
 preserving foo for resolve of foo
+update: foo 1/2 files (50.00%)
 picked tool 'internal:merge' for bar (binary False symlink False)
 merging foo and bar to bar
 my bar@2092631ce82b+ other bar@7731dad1c2b9 ancestor foo@310fd17130da
  premerge successful
+update: foo 2/2 files (100.00%)
 picked tool 'internal:merge' for foo (binary False symlink False)
 merging foo
 my foo@2092631ce82b+ other foo@7731dad1c2b9 ancestor foo@310fd17130da
  premerge successful
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 -- foo --
 line 0
 line 1
 line 2-1
 -- bar --
 line 0
 line 1
 line 2-2

tests/test-issue522.out

@@ -1,20 +1,21 b''
 reverting foo
 changeset 2:4d9e78aaceee backs out changeset 1:b515023e500e
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in local:
    bar
 resolving manifests
  overwrite None partial False
  ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
  foo: remote is newer -> g
+update: foo 1/1 files (100.00%)
 getting foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 n   0         -2 unset               foo
 M foo
 c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       5      0       0 2ed2a3912a0b 000000000000 000000000000
      1         5       9      1       1 6f4310b00b9a 2ed2a3912a0b 000000000000
      2        14       5      2       2 c6fc755d7e68 6f4310b00b9a 000000000000

tests/test-issue672.out

@@ -1,58 +1,62 b''
 adding 1
 adding 2
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
   searching for copies back to rev 1
   unmatched files in other:
    1a
   all copies found (* = to merge, ! = divergent):
    1a -> 1 
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 81f4b099af3d local c64f439569a9+ remote 2f8037f47a5c
  1: other deleted -> r
  1a: remote created -> g
+update: 1 1/2 files (50.00%)
 removing 1
+update: 1a 2/2 files (100.00%)
 getting 1a
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in local:
    1a
   all copies found (* = to merge, ! = divergent):
    1a -> 1 *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor c64f439569a9 local ac7575e3c052+ remote 746e9549ea96
  1a: local copied/moved to 1 -> m
 preserving 1a for resolve of 1a
+update: 1a 1/1 files (100.00%)
 picked tool 'internal:merge' for 1a (binary False symlink False)
 merging 1a and 1 to 1a
 my 1a@ac7575e3c052+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in other:
    1a
   all copies found (* = to merge, ! = divergent):
    1a -> 1 *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor c64f439569a9 local 746e9549ea96+ remote ac7575e3c052
  1: remote moved to 1a -> m
 preserving 1 for resolve of 1a
 removing 1
+update: 1 1/1 files (100.00%)
 picked tool 'internal:merge' for 1a (binary False symlink False)
 merging 1 and 1a to 1a
 my 1a@746e9549ea96+ other 1a@ac7575e3c052 ancestor 1@81f4b099af3d
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)

tests/test-merge-commit.out

@@ -1,94 +1,96 b''
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 merging bar and foo to bar
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % contents of bar should be line0 line1 line2
 line0
 line1
 line2
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      77      0       2 da78c0659611 000000000000 000000000000
      1        77      76      0       3 4b358025380b 000000000000 da78c0659611
 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 690b295714ae 000000000000 000000000000
      1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 4:2d2f9a22c82b 2:0a3ab4856510 
 3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d 
 2:0a3ab4856510 0:2665aaee66e9 
 1:5cd961e4045d 
 0:2665aaee66e9 
 % this should use bar@rev2 as the ancestor
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1
  bar: versions differ -> m
 preserving bar for resolve of bar
+update: bar 1/1 files (100.00%)
 picked tool 'internal:merge' for bar (binary False symlink False)
 merging bar
 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % contents of bar should be line1 line2
 line1
 line2
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      77      0       2 da78c0659611 000000000000 000000000000
      1        77      76      0       3 4b358025380b 000000000000 da78c0659611
      2       153       7      2       4 4defe5eec418 da78c0659611 000000000000
      3       160      13      3       5 4663501da27b 4defe5eec418 4b358025380b
 
 
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 3 changesets with 3 changes to 2 files (+1 heads)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging foo and bar to bar
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % contents of bar should be line0 line1 line2
 line0
 line1
 line2
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      77      0       2 da78c0659611 000000000000 000000000000
      1        77      76      0       3 4b358025380b 000000000000 da78c0659611
 bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 690b295714ae 000000000000 000000000000
      1         7      13      1       1 9e25c27b8757 690b295714ae 000000000000
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 4:2d2f9a22c82b 2:0a3ab4856510 
 3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510 
 2:0a3ab4856510 0:2665aaee66e9 
 1:5cd961e4045d 
 0:2665aaee66e9 
 % this should use bar@rev2 as the ancestor
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897
  bar: versions differ -> m
 preserving bar for resolve of bar
+update: bar 1/1 files (100.00%)
 picked tool 'internal:merge' for bar (binary False symlink False)
 merging bar
 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % contents of bar should be line1 line2
 line1
 line2
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0      77      0       2 da78c0659611 000000000000 000000000000
      1        77      76      0       3 4b358025380b 000000000000 da78c0659611
      2       153       7      2       4 4defe5eec418 da78c0659611 000000000000
      3       160      13      3       5 4663501da27b 4defe5eec418 4b358025380b

tests/test-merge-types.out

@@ -1,27 +1,29 b''
 adding a
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
  conflicting flags for a
 (n)one, e(x)ec or sym(l)ink? n
  a: update permissions -> e
+update: a 1/1 files (100.00%)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % symlink is local parent, executable is other
 a has no flags (default for conflicts)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
  conflicting flags for a
 (n)one, e(x)ec or sym(l)ink? n
  a: remote is newer -> g
+update: a 1/1 files (100.00%)
 getting a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % symlink is other parent, executable is local
 a has no flags (default for conflicts)

tests/test-merge7.out

@@ -1,77 +1,78 b''
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../test-a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 merging test.txt
 warning: conflicts during merge.
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 pulling from ../test-a
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
  test.txt: versions differ -> m
 preserving test.txt for resolve of test.txt
+update: test.txt 1/1 files (100.00%)
 picked tool 'internal:merge' for test.txt (binary False symlink False)
 merging test.txt
 my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
 warning: conflicts during merge.
 merging test.txt failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 one
 <<<<<<< local
 two-point-five
 =======
 two-point-one
 >>>>>>> other
 three
    rev    offset  length   base linkrev nodeid       p1           p2
      0         0       7      0       0 01365c4cca56 000000000000 000000000000
      1         7       9      1       1 7b013192566a 01365c4cca56 000000000000
      2        16      15      2       2 8fe46a3eb557 01365c4cca56 000000000000
      3        31      27      2       3 fc3148072371 7b013192566a 8fe46a3eb557
      4        58      25      4       4 d40249267ae3 8fe46a3eb557 000000000000
 changeset:   4:a070d41e8360
 tag:         tip
 parent:      2:faaea63e63a9
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     two -> two-point-one
 
 changeset:   3:451c744aabcc
 parent:      1:e409be6afcc0
 parent:      2:faaea63e63a9
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Merge 1
 
 changeset:   2:faaea63e63a9
 parent:      0:095c92b91f1a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Numbers as words
 
 changeset:   1:e409be6afcc0
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2 -> 2.5
 
 changeset:   0:095c92b91f1a
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Initial
 

tests/test-rename-dir-merge.out

@@ -1,75 +1,82 b''
 adding a/a
 adding a/b
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 moving a/a to b/a
 moving a/b to b/b
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
   searching for copies back to rev 1
   unmatched files in local:
    a/c
    a/d
   unmatched files in other:
    b/a
    b/b
   all copies found (* = to merge, ! = divergent):
    b/a -> a/a 
    b/b -> a/b 
   checking for directory renames
   dir a/ -> b/
   file a/c -> b/c
   file a/d -> b/d
 resolving manifests
  overwrite None partial False
  ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
  a/d: remote renamed directory to b/d -> d
  a/c: remote renamed directory to b/c -> d
  a/b: other deleted -> r
  a/a: other deleted -> r
  b/a: remote created -> g
  b/b: remote created -> g
+update: a/a 1/6 files (16.67%)
 removing a/a
+update: a/b 2/6 files (33.33%)
 removing a/b
+update: a/c 3/6 files (50.00%)
 moving a/c to b/c
+update: a/d 4/6 files (66.67%)
 moving a/d to b/d
+update: b/a 5/6 files (83.33%)
 getting b/a
+update: b/b 6/6 files (100.00%)
 getting b/b
 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 a/* b/a b/b b/c b/d
 M b/a
 M b/b
 A b/c
   a/c
 R a/a
 R a/b
 R a/c
 ? b/d
 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in local:
    b/a
    b/b
    b/d
   unmatched files in other:
    a/c
   all copies found (* = to merge, ! = divergent):
    b/a -> a/a 
    b/b -> a/b 
   checking for directory renames
   dir a/ -> b/
   file a/c -> b/c
 resolving manifests
  overwrite None partial False
  ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
  None: local renamed directory to b/c -> d
+update:None 1/1 files (100.00%)
 getting a/c to b/c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 a/* b/a b/b b/c b/d
 A b/c
   a/c
 ? b/d
 created new head
 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88

tests/test-rename-merge1.out

@@ -1,43 +1,46 b''
 checkout
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 created new head
 merge
   searching for copies back to rev 1
   unmatched files in local:
    c2
   unmatched files in other:
    b
    b2
   all copies found (* = to merge, ! = divergent):
    c2 -> a2 !
    b -> a *
    b2 -> a2 !
   checking for directory renames
  a2: divergent renames -> dr
 resolving manifests
  overwrite None partial False
  ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
  a: remote moved to b -> m
  b2: remote created -> g
 preserving a for resolve of b
 removing a
+update: a 1/3 files (33.33%)
 picked tool 'internal:merge' for b (binary False symlink False)
 merging a and b to b
 my b@f26ec4fc3fa3+ other b@8e765a822af2 ancestor a@af1939970a1c
  premerge successful
+update: a2 2/3 files (66.67%)
 warning: detected divergent renames of a2 to:
  c2
  b2
+update: b2 3/3 files (100.00%)
 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
 b renamed from a:dd03b83622e78778b403775d0d074b9ac7387a66

tests/test-rename-merge2.out

@@ -1,601 +1,651 b''
 created new head
 --------------
 test L:up a   R:nc a b W:       - 1  get local a to b
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local e300d1c794ec+ remote 735846fee2d7
  rev: versions differ -> m
  a: remote copied to b -> m
 preserving a for resolve of b
 preserving rev for resolve of rev
+update: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
 my b@e300d1c794ec+ other b@735846fee2d7 ancestor a@924404dff337
  premerge successful
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@e300d1c794ec+ 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
   a
 C a
 --------------
 
 created new head
 --------------
 test L:nc a b R:up a   W:       - 2  get rem change to a and b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote f4db7e329e71
  a: remote is newer -> g
  b: local copied/moved to a -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
 getting a
+update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
 my b@ac809aeed39a+ other a@f4db7e329e71 ancestor a@924404dff337
  premerge successful
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ac809aeed39a+ 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
 --------------
 
 created new head
 --------------
 test L:up a   R:nm a b W:       - 3  get local a change to b, remove a
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local e300d1c794ec+ remote e03727d2d66b
  rev: versions differ -> m
  a: remote moved to b -> m
 preserving a for resolve of b
 preserving rev for resolve of rev
 removing a
+update: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
 my b@e300d1c794ec+ other b@e03727d2d66b ancestor a@924404dff337
  premerge successful
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@e300d1c794ec+ 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
 --------------
 
 created new head
 --------------
 test L:nm a b R:up a   W:       - 4  get remote change to b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote f4db7e329e71
  b: local copied/moved to a -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
 my b@ecf3cb2a4219+ other a@f4db7e329e71 ancestor a@924404dff337
  premerge successful
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ecf3cb2a4219+ 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
 --------------
 
 created new head
 --------------
 test L:       R:nc a b W:       - 5  get b
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 94b33a1b7f2d+ remote 735846fee2d7
  rev: versions differ -> m
  b: remote created -> g
 preserving rev for resolve of rev
+update: b 1/2 files (50.00%)
 getting b
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@94b33a1b7f2d+ other rev@735846fee2d7 ancestor rev@924404dff337
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 C a
 --------------
 
 created new head
 --------------
 test L:nc a b R:       W:       - 6  nothing
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote 97c705ade336
  rev: versions differ -> m
 preserving rev for resolve of rev
+update: rev 1/1 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ac809aeed39a+ other rev@97c705ade336 ancestor rev@924404dff337
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 C a
 C b
 --------------
 
 created new head
 --------------
 test L:       R:nm a b W:       - 7  get b
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 94b33a1b7f2d+ remote e03727d2d66b
  a: other deleted -> r
  rev: versions differ -> m
  b: remote created -> g
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
 removing a
+update: b 2/3 files (66.67%)
 getting b
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@94b33a1b7f2d+ other rev@e03727d2d66b ancestor rev@924404dff337
 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 M b
 --------------
 
 created new head
 --------------
 test L:nm a b R:       W:       - 8  nothing
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a 
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote 97c705ade336
  rev: versions differ -> m
 preserving rev for resolve of rev
+update: rev 1/1 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ecf3cb2a4219+ other rev@97c705ade336 ancestor rev@924404dff337
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 --------------
 C b
 --------------
 
 created new head
 --------------
 test L:um a b R:um a b W:       - 9  do merge with ancestor in a
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ec03c2ca8642+ remote 79cc6877a3b7
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@ec03c2ca8642+ other b@79cc6877a3b7 ancestor a@924404dff337
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ec03c2ca8642+ 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
 --------------
 
 created new head
 --------------
 test L:nm a b R:nm a c W:       - 11 get c, keep b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   unmatched files in other:
    c
   all copies found (* = to merge, ! = divergent):
    c -> a !
    b -> a !
   checking for directory renames
  a: divergent renames -> dr
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote e6abcc1a30c2
  rev: versions differ -> m
  c: remote created -> g
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
 warning: detected divergent renames of a to:
  b
  c
+update: c 2/3 files (66.67%)
 getting c
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ecf3cb2a4219+ 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
 --------------
 
 created new head
 --------------
 test L:nc a b R:up b   W:       - 12 merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote af30c7647fc7
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@ac809aeed39a+ other b@af30c7647fc7 ancestor b@000000000000
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ac809aeed39a+ 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
 --------------
 
 created new head
 --------------
 test L:up b   R:nm a b W:       - 13 merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
  a: other deleted -> r
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
 removing a
+update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@59318016310c+ 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
 --------------
 
 created new head
 --------------
 test L:nc a b R:up a b W:       - 14 merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
  a: remote is newer -> g
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
 getting a
+update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ac809aeed39a+ 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
 --------------
 
 created new head
 --------------
 test L:up b   R:nm a b W:       - 15 merge b no ancestor, remove a
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 59318016310c+ remote e03727d2d66b
  a: other deleted -> r
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
 removing a
+update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@59318016310c+ other b@e03727d2d66b ancestor b@000000000000
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@59318016310c+ 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
 --------------
 
 created new head
 --------------
 test L:nc a b R:up a b W:       - 16 get a, merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ac809aeed39a+ remote 8dbce441892a
  a: remote is newer -> g
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
 getting a
+update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@ac809aeed39a+ other b@8dbce441892a ancestor b@000000000000
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ac809aeed39a+ 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
 --------------
 
 created new head
 --------------
 test L:up a b R:nc a b W:       - 17 keep a, merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 0b76e65c8289+ remote 735846fee2d7
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@0b76e65c8289+ other b@735846fee2d7 ancestor b@000000000000
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@0b76e65c8289+ 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
 --------------
 
 created new head
 --------------
 test L:nm a b R:up a b W:       - 18 merge b no ancestor
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote 8dbce441892a
  b: versions differ -> m
  rev: versions differ -> m
 remote changed a which local deleted
 use (c)hanged version or leave (d)eleted? c
  a: prompt recreating -> g
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
 getting a
+update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@ecf3cb2a4219+ other b@8dbce441892a ancestor b@000000000000
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ecf3cb2a4219+ 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
 --------------
 
 created new head
 --------------
 test L:up a b R:nm a b W:       - 19 merge b no ancestor, prompt remove a
 --------------
   searching for copies back to rev 1
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local 0b76e65c8289+ remote e03727d2d66b
  local changed a which remote deleted
 use (c)hanged version or (d)elete? c
  a: prompt keep -> a
  b: versions differ -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: a 1/3 files (33.33%)
+update: b 2/3 files (66.67%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b
 my b@0b76e65c8289+ other b@e03727d2d66b ancestor b@000000000000
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@0b76e65c8289+ 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
 --------------
 
 created new head
 --------------
 test L:up a   R:um a b W:       - 20 merge a and b to b, remove a
 --------------
   searching for copies back to rev 1
   unmatched files in other:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local e300d1c794ec+ remote 79cc6877a3b7
  rev: versions differ -> m
  a: remote moved to b -> m
 preserving a for resolve of b
 preserving rev for resolve of rev
 removing a
+update: a 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging a and b to b
 my b@e300d1c794ec+ other b@79cc6877a3b7 ancestor a@924404dff337
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@e300d1c794ec+ 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
 --------------
 
 created new head
 --------------
 test L:um a b R:up a   W:       - 21 merge a and b to b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ec03c2ca8642+ remote f4db7e329e71
  b: local copied/moved to a -> m
  rev: versions differ -> m
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: b 1/2 files (50.00%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
 my b@ec03c2ca8642+ other a@f4db7e329e71 ancestor a@924404dff337
+update: rev 2/2 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ec03c2ca8642+ 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
 --------------
 
 created new head
 --------------
 test L:nm a b R:up a c W:       - 23 get c, keep b
 --------------
   searching for copies back to rev 1
   unmatched files in local:
    b
   unmatched files in other:
    c
   all copies found (* = to merge, ! = divergent):
    b -> a *
   checking for directory renames
 resolving manifests
  overwrite None partial False
  ancestor 924404dff337 local ecf3cb2a4219+ remote 2b958612230f
  b: local copied/moved to a -> m
  rev: versions differ -> m
  c: remote created -> g
 preserving b for resolve of b
 preserving rev for resolve of rev
+update: b 1/3 files (33.33%)
 picked tool 'python ../merge' for b (binary False symlink False)
 merging b and a to b
 my b@ecf3cb2a4219+ other a@2b958612230f ancestor a@924404dff337
  premerge successful
+update: c 2/3 files (66.67%)
 getting c
+update: rev 3/3 files (100.00%)
 picked tool 'python ../merge' for rev (binary False symlink False)
 merging rev
 my rev@ecf3cb2a4219+ 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
 --------------
 

tests/test-subrepo.out

@@ -1,257 +1,261 b''
 % first revision, no sub
 adding a
 % add first sub
 adding a
 committing subrepository s
 % add sub sub
 committing subrepository s
 committing subrepository ss
 % bump sub rev
 committing subrepository s
 % leave sub dirty
 committing subrepository s
 changeset:   3:1c833a7a9e3a
 tag:         tip
 user:        test
 date:        Thu Jan 01 00:00:00 1970 +0000
 summary:     4
 
 % check caching
 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
 % restore
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 path s
  source   s
  revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
 % new branch for merge tests
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding t/t
 % 5
 committing subrepository t
 created new head
 % 6
 committing subrepository t
 path s
  source   s
  revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
 path t
  source   t
  revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
 % 7
 committing subrepository t
 % 8
 % merge tests
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
 created new head
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
  .hgsubstate: versions differ -> m
+update: .hgsubstate 1/1 files (100.00%)
 subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
   subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
 getting subrepo t
 resolving manifests
  overwrite True partial False
  ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
  t: remote is newer -> g
+update: t 1/1 files (100.00%)
 getting t
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
 committing subrepository t
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
  .hgsubstate: versions differ -> m
+update: .hgsubstate 1/1 files (100.00%)
 subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
   subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
 merging subrepo t
   searching for copies back to rev 2
 resolving manifests
  overwrite None partial False
  ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
  t: versions differ -> m
 preserving t for resolve of t
+update: t 1/1 files (100.00%)
 picked tool 'internal:merge' for t (binary False symlink False)
 merging t
 my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
 warning: conflicts during merge.
 merging t failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % should conflict
 <<<<<<< local
 conflict
 =======
 t3
 >>>>>>> other
 % clone
 updating to branch default
 pulling subrepo s
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 5 changes to 3 files
 pulling subrepo ss
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 pulling subrepo t
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 4 changesets with 4 changes to 1 files (+1 heads)
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
 path t
  source   t
  revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
 % push
 committing subrepository t
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 no changes found
 pushing ...subrepo t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 % push -f
 committing subrepository s
 abort: push creates new remote heads on branch 'default'!
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 (did you forget to merge? use push -f to force)
 pushing ...subrepo t
 searching for changes
 no changes found
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 pushing ...sub/t
 pushing ...subrepo ss
 searching for changes
 no changes found
 pushing ...subrepo s
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
 pushing ...subrepo t
 searching for changes
 no changes found
 searching for changes
 no changes found
 % update
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 committing subrepository t
 % pull
 pulling ...sub/t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 (run 'hg update' to get a working copy)
 pulling subrepo t
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 blah
 % bogus subrepo path aborts
 abort: missing ] in subrepo source
 % issue 1986
 adding a
 marked working directory as branch br
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding c
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding .hgsub
 committing subrepository s
 marked working directory as branch br
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding b
 committing subrepository s
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding c
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding d
 committing subrepository s
 created new head
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding e
 committing subrepository s
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 % test repository cloning
 adding nested_absolute/foo
 adding nested_relative/foo2
 adding main/.hgsub
 committing subrepository nested_relative
 committing subrepository nested_absolute
 updating to branch default
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 [paths]
 default = /tmp/mercurial/main/nested_absolute
 [paths]
 default = /tmp/mercurial/main/nested_relative

tests/test-up-local-change.out

@@ -1,159 +1,167 b''
 adding a
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 diff -r 33aaa84a386b a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a
 +abc
 adding b
 M a
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
   searching for copies back to rev 1
   unmatched files in other:
    b
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
  a: versions differ -> m
  b: remote created -> g
 preserving a for resolve of a
+update: a 1/2 files (50.00%)
 picked tool 'true' for a (binary False symlink False)
 merging a
 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
+update: b 2/2 files (100.00%)
 getting b
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 changeset:   1:802f095af299
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 resolving manifests
  overwrite False partial False
  ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b
  a: versions differ -> m
  b: other deleted -> r
 preserving a for resolve of a
+update: b 1/2 files (50.00%)
 removing b
+update: a 2/2 files (100.00%)
 picked tool 'true' for a (binary False symlink False)
 merging a
 my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b
  premerge successful
 0 files updated, 1 files merged, 1 files removed, 0 files unresolved
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
 abort: there is nothing to merge - use "hg update" instead
 failed
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     1
 
   searching for copies back to rev 1
   unmatched files in other:
    b
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
  a: versions differ -> m
  b: remote created -> g
 preserving a for resolve of a
+update: a 1/2 files (50.00%)
 picked tool 'true' for a (binary False symlink False)
 merging a
 my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
+update: b 2/2 files (100.00%)
 getting b
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
 changeset:   1:802f095af299
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   1:802f095af299
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 files:       a b
 description:
 2
 
 
 changeset:   0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 files:       a
 description:
 1
 
 
 diff -r 802f095af299 a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding b
 created new head
 M a
 changeset:   1:802f095af299
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes)
 failed
 abort: outstanding uncommitted changes (use 'hg status' to list changes)
 failed
   searching for copies back to rev 1
 resolving manifests
  overwrite False partial False
  ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
  a: versions differ -> m
  b: versions differ -> m
 preserving a for resolve of a
 preserving b for resolve of b
+update: a 1/2 files (50.00%)
 picked tool 'true' for a (binary False symlink False)
 merging a
 my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
+update: b 2/2 files (100.00%)
 picked tool 'true' for b (binary False symlink False)
 merging b
 my b@802f095af299+ other b@030602aee63d ancestor b@000000000000
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
 (branch merge, don't forget to commit)
 changeset:   1:802f095af299
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     2
 
 changeset:   2:030602aee63d
 tag:         tip
 parent:      0:33aaa84a386b
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     3
 
 diff -r 802f095af299 a
 --- a/a
 +++ b/a
 @@ -1,1 +1,1 @@
 -a2
 +abc
 adding a
 pulling from ../a
 requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved

tests/test-update-reverse.out

@@ -1,55 +1,58 b''
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 Main should be gone
 a
 created new head
 changeset:   3:ded32b0db104
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added side2
 
 changeset:   2:92a816cea698
 parent:      0:537353581d3d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added side1
 
 changeset:   1:221226fb2bd8
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added main
 
 changeset:   0:537353581d3d
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added a
 
 Should have two heads, side2 and main
 changeset:   3:ded32b0db104
 tag:         tip
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added side2
 
 changeset:   1:221226fb2bd8
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000
 summary:     Added main
 
 Should show a side1 side2
 a
 side1
 side2
 resolving manifests
  overwrite True partial False
  ancestor ded32b0db104+ local ded32b0db104+ remote 221226fb2bd8
  side2: other deleted -> r
  side1: other deleted -> r
  main: remote created -> g
+update: side1 1/3 files (33.33%)
 removing side1
+update: side2 2/3 files (66.67%)
 removing side2
+update: main 3/3 files (100.00%)
 getting main
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 Should only show a main
 a
 main