Merge with crew-stable

mercurial/copies.py

@@ -1,233 +1,245
 # copies.py - copy detection for Mercurial
 #
 # Copyright 2008 Matt Mackall <[e-mail]>
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
 from i18n import _
 import util
 import heapq
 
 def _nonoverlap(d1, d2, d3):
     "Return list of elements in d1 not in d2 or d3"
     return sorted([d for d in d1 if d not in d3 and d not in d2])
 
 def _dirname(f):
     s = f.rfind("/")
     if s == -1:
         return ""
     return f[:s]
 
 def _dirs(files):
     d = set()
     for f in files:
         f = _dirname(f)
         while f not in d:
             d.add(f)
             f = _dirname(f)
     return d
 
 def _findoldnames(fctx, limit):
     "find files that path was copied from, back to linkrev limit"
     old = {}
     seen = set()
     orig = fctx.path()
     visit = [(fctx, 0)]
     while visit:
         fc, depth = visit.pop()
         s = str(fc)
         if s in seen:
             continue
         seen.add(s)
         if fc.path() != orig and fc.path() not in old:
             old[fc.path()] = (depth, fc.path()) # remember depth
         if fc.rev() is not None and fc.rev() < limit:
             continue
         visit += [(p, depth - 1) for p in fc.parents()]
 
     # return old names sorted by depth
     return [o[1] for o in sorted(old.values())]
 
 def _findlimit(repo, a, b):
-    "find the earliest revision that's an ancestor of a or b but not both"
+    """Find the earliest revision that's an ancestor of a or b but not both,
+    None if no such revision exists.
+    """
     # basic idea:
     # - mark a and b with different sides
     # - if a parent's children are all on the same side, the parent is
     #   on that side, otherwise it is on no side
     # - walk the graph in topological order with the help of a heap;
     #   - add unseen parents to side map
     #   - clear side of any parent that has children on different sides
     #   - track number of interesting revs that might still be on a side
     #   - track the lowest interesting rev seen
     #   - quit when interesting revs is zero
 
     cl = repo.changelog
     working = len(cl) # pseudo rev for the working directory
     if a is None:
         a = working
     if b is None:
         b = working
 
     side = {a: -1, b: 1}
     visit = [-a, -b]
     heapq.heapify(visit)
     interesting = len(visit)
+    hascommonancestor = False
     limit = working
 
     while interesting:
         r = -heapq.heappop(visit)
         if r == working:
             parents = [cl.rev(p) for p in repo.dirstate.parents()]
         else:
             parents = cl.parentrevs(r)
         for p in parents:
+            if p < 0:
+                continue
             if p not in side:
                 # first time we see p; add it to visit
                 side[p] = side[r]
                 if side[p]:
                     interesting += 1
                 heapq.heappush(visit, -p)
             elif side[p] and side[p] != side[r]:
                 # p was interesting but now we know better
                 side[p] = 0
                 interesting -= 1
+                hascommonancestor = True
         if side[r]:
             limit = r # lowest rev visited
             interesting -= 1
+
+    if not hascommonancestor:
+        return None
     return limit
 
 def copies(repo, c1, c2, ca, checkdirs=False):
     """
     Find moves and copies between context c1 and c2
     """
     # avoid silly behavior for update from empty dir
     if not c1 or not c2 or c1 == c2:
         return {}, {}
 
     # avoid silly behavior for parent -> working dir
     if c2.node() is None and c1.node() == repo.dirstate.parents()[0]:
         return repo.dirstate.copies(), {}
 
     limit = _findlimit(repo, c1.rev(), c2.rev())
+    if limit is None:
+        # no common ancestor, no copies
+        return {}, {}
     m1 = c1.manifest()
     m2 = c2.manifest()
     ma = ca.manifest()
 
     def makectx(f, n):
         if len(n) != 20: # in a working context?
             if c1.rev() is None:
                 return c1.filectx(f)
             return c2.filectx(f)
         return repo.filectx(f, fileid=n)
 
     ctx = util.lrucachefunc(makectx)
     copy = {}
     fullcopy = {}
     diverge = {}
 
     def checkcopies(f, m1, m2):
         '''check possible copies of f from m1 to m2'''
         c1 = ctx(f, m1[f])
         for of in _findoldnames(c1, limit):
             fullcopy[f] = of # remember for dir rename detection
             if of in m2: # original file not in other manifest?
                 # if the original file is unchanged on the other branch,
                 # no merge needed
                 if m2[of] != ma.get(of):
                     c2 = ctx(of, m2[of])
                     ca = c1.ancestor(c2)
                     # related and named changed on only one side?
                     if ca and (ca.path() == f or ca.path() == c2.path()):
                         if c1 != ca or c2 != ca: # merge needed?
                             copy[f] = of
             elif of in ma:
                 diverge.setdefault(of, []).append(f)
 
     repo.ui.debug("  searching for copies back to rev %d\n" % limit)
 
     u1 = _nonoverlap(m1, m2, ma)
     u2 = _nonoverlap(m2, m1, ma)
 
     if u1:
         repo.ui.debug("  unmatched files in local:\n   %s\n"
                       % "\n   ".join(u1))
     if u2:
         repo.ui.debug("  unmatched files in other:\n   %s\n"
                       % "\n   ".join(u2))
 
     for f in u1:
         checkcopies(f, m1, m2)
     for f in u2:
         checkcopies(f, m2, m1)
 
     diverge2 = set()
     for of, fl in diverge.items():
         if len(fl) == 1:
             del diverge[of] # not actually divergent
         else:
             diverge2.update(fl) # reverse map for below
 
     if fullcopy:
         repo.ui.debug("  all copies found (* = to merge, ! = divergent):\n")
         for f in fullcopy:
             note = ""
             if f in copy: note += "*"
             if f in diverge2: note += "!"
             repo.ui.debug("   %s -> %s %s\n" % (f, fullcopy[f], note))
     del diverge2
 
     if not fullcopy or not checkdirs:
         return copy, diverge
 
     repo.ui.debug("  checking for directory renames\n")
 
     # generate a directory move map
     d1, d2 = _dirs(m1), _dirs(m2)
     invalid = set()
     dirmove = {}
 
     # examine each file copy for a potential directory move, which is
     # when all the files in a directory are moved to a new directory
     for dst, src in fullcopy.iteritems():
         dsrc, ddst = _dirname(src), _dirname(dst)
         if dsrc in invalid:
             # already seen to be uninteresting
             continue
         elif dsrc in d1 and ddst in d1:
             # directory wasn't entirely moved locally
             invalid.add(dsrc)
         elif dsrc in d2 and ddst in d2:
             # directory wasn't entirely moved remotely
             invalid.add(dsrc)
         elif dsrc in dirmove and dirmove[dsrc] != ddst:
             # files from the same directory moved to two different places
             invalid.add(dsrc)
         else:
             # looks good so far
             dirmove[dsrc + "/"] = ddst + "/"
 
     for i in invalid:
         if i in dirmove:
             del dirmove[i]
     del d1, d2, invalid
 
     if not dirmove:
         return copy, diverge
 
     for d in dirmove:
         repo.ui.debug("  dir %s -> %s\n" % (d, dirmove[d]))
 
     # check unaccounted nonoverlapping files against directory moves
     for f in u1 + u2:
         if f not in fullcopy:
             for d in dirmove:
                 if f.startswith(d):
                     # new file added in a directory that was moved, move it
                     df = dirmove[d] + f[len(d):]
                     if df not in copy:
                         copy[f] = df
                         repo.ui.debug("  file %s -> %s\n" % (f, copy[f]))
                     break
 
     return copy, diverge

tests/test-mv-cp-st-diff

@@ -1,80 +1,95
 #!/bin/sh
 
 add()
 {
     echo $2 >> $1
 }
 
 hg init t
 cd t
 
 # set up a boring main branch
 add a a
 hg add a
 mkdir x
 add x/x x
 hg add x/x
 hg ci -m0
 
 add a m1
 hg ci -m1
 
 add a m2
 add x/y y1
 hg add x/y
 hg ci -m2
 cd ..
 
 show()
 {
     echo "- $2: $1"
     hg st -C $1
     echo
     hg diff --git $1
     echo
 }
 
 count=0
 # make a new branch and get diff/status output
 # $1 - first commit
 # $2 - second commit
 # $3 - working dir action
 # $4 - test description
 tb()
 {
     hg clone t t2 ; cd t2
     hg co -q -C 0
 
     add a $count
     count=`expr $count + 1`
     hg ci -m "t0"
     $1
     hg ci -m "t1"
     $2
     hg ci -m "t2"
     $3
 
     echo "** $4 **"
     echo "** $1 / $2 / $3"
     show "" "working to parent"
     show "--rev 0" "working to root"
     show "--rev 2" "working to branch"
     show "--rev 0 --rev ." "root to parent"
     show "--rev . --rev 0" "parent to root"
     show "--rev 2 --rev ." "branch to parent"
     show "--rev . --rev 2" "parent to branch"
     echo
     cd ..
     rm -rf t2
 }
 
 
 tb "add a a1" "add a a2" "hg mv a b" "rename in working dir"
 tb "add a a1" "add a a2" "hg cp a b" "copy in working dir" 
 tb "hg mv a b" "add b b1" "add b w" "single rename"
 tb "hg cp a b" "add b b1" "add a w" "single copy"
 tb "hg mv a b" "hg mv b c" "hg mv c d" "rename chain"
 tb "hg cp a b" "hg cp b c" "hg cp c d" "copy chain"
 tb "add a a1" "hg mv a b" "hg mv b a" "circular rename"
 
 tb "hg mv x y" "add y/x x1" "add y/x x2" "directory move"
+
+# Cannot implement unrelated branch with tb
+echo '% testing copies with unrelated branch'
+hg init unrelated
+cd unrelated
+add a a
+hg ci -Am adda
+hg mv a b
+hg ci -m movea
+hg up -C null
+add a a
+hg ci -Am addunrelateda
+echo '% unrelated branch diff'
+hg diff --git -r 2 -r 1
+cd ..

tests/test-mv-cp-st-diff.out

@@ -1,1236 +1,1254
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 ** rename in working dir **
 ** add a a1 / add a a2 / hg mv a b
 - working to parent: 
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 
 - working to root: --rev 0
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,4 @@
  a
 +0
 +a1
 +a2
 
 - working to branch: --rev 2
 A b
   a
 R a
 R x/y
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,4 @@
  a
 -m1
 -m2
 +0
 +a1
 +a2
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - root to parent: --rev 0 --rev .
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,4 @@
  a
 +0
 +a1
 +a2
 
 - parent to root: --rev . --rev 0
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,4 +1,1 @@
  a
 -0
 -a1
 -a2
 
 - branch to parent: --rev 2 --rev .
 M a
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,4 @@
  a
 -m1
 -m2
 +0
 +a1
 +a2
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - parent to branch: --rev . --rev 2
 M a
 A x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,4 +1,3 @@
  a
 -0
 -a1
 -a2
 +m1
 +m2
 diff --git a/x/y b/x/y
 new file mode 100644
 --- /dev/null
 +++ b/x/y
 @@ -0,0 +1,1 @@
 +y1
 
 
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 ** copy in working dir **
 ** add a a1 / add a a2 / hg cp a b
 - working to parent: 
 A b
   a
 
 diff --git a/a b/b
 copy from a
 copy to b
 
 - working to root: --rev 0
 M a
 A b
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,4 @@
  a
 +1
 +a1
 +a2
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,4 @@
  a
 +1
 +a1
 +a2
 
 - working to branch: --rev 2
 M a
 A b
   a
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,4 @@
  a
 -m1
 -m2
 +1
 +a1
 +a2
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,4 @@
  a
 -m1
 -m2
 +1
 +a1
 +a2
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - root to parent: --rev 0 --rev .
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,4 @@
  a
 +1
 +a1
 +a2
 
 - parent to root: --rev . --rev 0
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,4 +1,1 @@
  a
 -1
 -a1
 -a2
 
 - branch to parent: --rev 2 --rev .
 M a
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,4 @@
  a
 -m1
 -m2
 +1
 +a1
 +a2
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - parent to branch: --rev . --rev 2
 M a
 A x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,4 +1,3 @@
  a
 -1
 -a1
 -a2
 +m1
 +m2
 diff --git a/x/y b/x/y
 new file mode 100644
 --- /dev/null
 +++ b/x/y
 @@ -0,0 +1,1 @@
 +y1
 
 
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 ** single rename **
 ** hg mv a b / add b b1 / add b w
 - working to parent: 
 M b
 
 diff --git a/b b/b
 --- a/b
 +++ b/b
 @@ -1,3 +1,4 @@
  a
  2
  b1
 +w
 
 - working to root: --rev 0
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,4 @@
  a
 +2
 +b1
 +w
 
 - working to branch: --rev 2
 A b
   a
 R a
 R x/y
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,4 @@
  a
 -m1
 -m2
 +2
 +b1
 +w
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - root to parent: --rev 0 --rev .
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,3 @@
  a
 +2
 +b1
 
 - parent to root: --rev . --rev 0
 A a
   b
 R b
 
 diff --git a/b b/a
 rename from b
 rename to a
 --- a/b
 +++ b/a
 @@ -1,3 +1,1 @@
  a
 -2
 -b1
 
 - branch to parent: --rev 2 --rev .
 A b
   a
 R a
 R x/y
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,3 @@
  a
 -m1
 -m2
 +2
 +b1
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - parent to branch: --rev . --rev 2
 A a
   b
 A x/y
 R b
 
 diff --git a/b b/a
 rename from b
 rename to a
 --- a/b
 +++ b/a
 @@ -1,3 +1,3 @@
  a
 -2
 -b1
 +m1
 +m2
 diff --git a/x/y b/x/y
 new file mode 100644
 --- /dev/null
 +++ b/x/y
 @@ -0,0 +1,1 @@
 +y1
 
 
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 ** single copy **
 ** hg cp a b / add b b1 / add a w
 - working to parent: 
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,2 +1,3 @@
  a
  3
 +w
 
 - working to root: --rev 0
 M a
 A b
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,3 @@
  a
 +3
 +w
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,3 @@
  a
 +3
 +b1
 
 - working to branch: --rev 2
 M a
 A b
   a
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,3 @@
  a
 -m1
 -m2
 +3
 +w
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,3 @@
  a
 -m1
 -m2
 +3
 +b1
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - root to parent: --rev 0 --rev .
 M a
 A b
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +3
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,3 @@
  a
 +3
 +b1
 
 - parent to root: --rev . --rev 0
 M a
 R b
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,2 +1,1 @@
  a
 -3
 diff --git a/b b/b
 deleted file mode 100644
 --- a/b
 +++ /dev/null
 @@ -1,3 +0,0 @@
 -a
 -3
 -b1
 
 - branch to parent: --rev 2 --rev .
 M a
 A b
   a
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +3
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,3 @@
  a
 -m1
 -m2
 +3
 +b1
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - parent to branch: --rev . --rev 2
 M a
 A x/y
 R b
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,2 +1,3 @@
  a
 -3
 +m1
 +m2
 diff --git a/b b/b
 deleted file mode 100644
 --- a/b
 +++ /dev/null
 @@ -1,3 +0,0 @@
 -a
 -3
 -b1
 diff --git a/x/y b/x/y
 new file mode 100644
 --- /dev/null
 +++ b/x/y
 @@ -0,0 +1,1 @@
 +y1
 
 
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 ** rename chain **
 ** hg mv a b / hg mv b c / hg mv c d
 - working to parent: 
 A d
   c
 R c
 
 diff --git a/c b/d
 rename from c
 rename to d
 
 - working to root: --rev 0
 A d
   a
 R a
 
 diff --git a/a b/d
 rename from a
 rename to d
 --- a/a
 +++ b/d
 @@ -1,1 +1,2 @@
  a
 +4
 
 - working to branch: --rev 2
 A d
   a
 R a
 R x/y
 
 diff --git a/a b/d
 rename from a
 rename to d
 --- a/a
 +++ b/d
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +4
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - root to parent: --rev 0 --rev .
 A c
   a
 R a
 
 diff --git a/a b/c
 rename from a
 rename to c
 --- a/a
 +++ b/c
 @@ -1,1 +1,2 @@
  a
 +4
 
 - parent to root: --rev . --rev 0
 A a
   c
 R c
 
 diff --git a/c b/a
 rename from c
 rename to a
 --- a/c
 +++ b/a
 @@ -1,2 +1,1 @@
  a
 -4
 
 - branch to parent: --rev 2 --rev .
 A c
   a
 R a
 R x/y
 
 diff --git a/a b/c
 rename from a
 rename to c
 --- a/a
 +++ b/c
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +4
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - parent to branch: --rev . --rev 2
 A a
   c
 A x/y
 R c
 
 diff --git a/c b/a
 rename from c
 rename to a
 --- a/c
 +++ b/a
 @@ -1,2 +1,3 @@
  a
 -4
 +m1
 +m2
 diff --git a/x/y b/x/y
 new file mode 100644
 --- /dev/null
 +++ b/x/y
 @@ -0,0 +1,1 @@
 +y1
 
 
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 ** copy chain **
 ** hg cp a b / hg cp b c / hg cp c d
 - working to parent: 
 A d
   c
 
 diff --git a/c b/d
 copy from c
 copy to d
 
 - working to root: --rev 0
 M a
 A b
   a
 A c
   a
 A d
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +5
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,2 @@
  a
 +5
 diff --git a/a b/c
 copy from a
 copy to c
 --- a/a
 +++ b/c
 @@ -1,1 +1,2 @@
  a
 +5
 diff --git a/a b/d
 copy from a
 copy to d
 --- a/a
 +++ b/d
 @@ -1,1 +1,2 @@
  a
 +5
 
 - working to branch: --rev 2
 M a
 A b
   a
 A c
   a
 A d
   a
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +5
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +5
 diff --git a/a b/c
 copy from a
 copy to c
 --- a/a
 +++ b/c
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +5
 diff --git a/a b/d
 copy from a
 copy to d
 --- a/a
 +++ b/d
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +5
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - root to parent: --rev 0 --rev .
 M a
 A b
   a
 A c
   a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +5
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,2 @@
  a
 +5
 diff --git a/a b/c
 copy from a
 copy to c
 --- a/a
 +++ b/c
 @@ -1,1 +1,2 @@
  a
 +5
 
 - parent to root: --rev . --rev 0
 M a
 R b
 R c
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,2 +1,1 @@
  a
 -5
 diff --git a/b b/b
 deleted file mode 100644
 --- a/b
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -a
 -5
 diff --git a/c b/c
 deleted file mode 100644
 --- a/c
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -a
 -5
 
 - branch to parent: --rev 2 --rev .
 M a
 A b
   a
 A c
   a
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +5
 diff --git a/a b/b
 copy from a
 copy to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +5
 diff --git a/a b/c
 copy from a
 copy to c
 --- a/a
 +++ b/c
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +5
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - parent to branch: --rev . --rev 2
 M a
 A x/y
 R b
 R c
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,2 +1,3 @@
  a
 -5
 +m1
 +m2
 diff --git a/b b/b
 deleted file mode 100644
 --- a/b
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -a
 -5
 diff --git a/c b/c
 deleted file mode 100644
 --- a/c
 +++ /dev/null
 @@ -1,2 +0,0 @@
 -a
 -5
 diff --git a/x/y b/x/y
 new file mode 100644
 --- /dev/null
 +++ b/x/y
 @@ -0,0 +1,1 @@
 +y1
 
 
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 ** circular rename **
 ** add a a1 / hg mv a b / hg mv b a
 - working to parent: 
 A a
   b
 R b
 
 diff --git a/b b/a
 rename from b
 rename to a
 
 - working to root: --rev 0
 M a
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,3 @@
  a
 +6
 +a1
 
 - working to branch: --rev 2
 M a
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,3 @@
  a
 -m1
 -m2
 +6
 +a1
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - root to parent: --rev 0 --rev .
 A b
   a
 R a
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
 @@ -1,1 +1,3 @@
  a
 +6
 +a1
 
 - parent to root: --rev . --rev 0
 A a
   b
 R b
 
 diff --git a/b b/a
 rename from b
 rename to a
 --- a/b
 +++ b/a
 @@ -1,3 +1,1 @@
  a
 -6
 -a1
 
 - branch to parent: --rev 2 --rev .
 A b
   a
 R a
 R x/y
 
 diff --git a/a b/b
 rename from a
 rename to b
 --- a/a
 +++ b/b
 @@ -1,3 +1,3 @@
  a
 -m1
 -m2
 +6
 +a1
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 
 - parent to branch: --rev . --rev 2
 A a
   b
 A x/y
 R b
 
 diff --git a/b b/a
 rename from b
 rename to a
 --- a/b
 +++ b/a
 @@ -1,3 +1,3 @@
  a
 -6
 -a1
 +m1
 +m2
 diff --git a/x/y b/x/y
 new file mode 100644
 --- /dev/null
 +++ b/x/y
 @@ -0,0 +1,1 @@
 +y1
 
 
 updating to branch default
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 moving x/x to y/x
 ** directory move **
 ** hg mv x y / add y/x x1 / add y/x x2
 - working to parent: 
 M y/x
 
 diff --git a/y/x b/y/x
 --- a/y/x
 +++ b/y/x
 @@ -1,2 +1,3 @@
  x
  x1
 +x2
 
 - working to root: --rev 0
 M a
 A y/x
   x/x
 R x/x
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +7
 diff --git a/x/x b/y/x
 rename from x/x
 rename to y/x
 --- a/x/x
 +++ b/y/x
 @@ -1,1 +1,3 @@
  x
 +x1
 +x2
 
 - working to branch: --rev 2
 M a
 A y/x
   x/x
 R x/x
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +7
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 diff --git a/x/x b/y/x
 rename from x/x
 rename to y/x
 --- a/x/x
 +++ b/y/x
 @@ -1,1 +1,3 @@
  x
 +x1
 +x2
 
 - root to parent: --rev 0 --rev .
 M a
 A y/x
   x/x
 R x/x
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,1 +1,2 @@
  a
 +7
 diff --git a/x/x b/y/x
 rename from x/x
 rename to y/x
 --- a/x/x
 +++ b/y/x
 @@ -1,1 +1,2 @@
  x
 +x1
 
 - parent to root: --rev . --rev 0
 M a
 A x/x
   y/x
 R y/x
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,2 +1,1 @@
  a
 -7
 diff --git a/y/x b/x/x
 rename from y/x
 rename to x/x
 --- a/y/x
 +++ b/x/x
 @@ -1,2 +1,1 @@
  x
 -x1
 
 - branch to parent: --rev 2 --rev .
 M a
 A y/x
   x/x
 R x/x
 R x/y
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,3 +1,2 @@
  a
 -m1
 -m2
 +7
 diff --git a/x/y b/x/y
 deleted file mode 100644
 --- a/x/y
 +++ /dev/null
 @@ -1,1 +0,0 @@
 -y1
 diff --git a/x/x b/y/x
 rename from x/x
 rename to y/x
 --- a/x/x
 +++ b/y/x
 @@ -1,1 +1,2 @@
  x
 +x1
 
 - parent to branch: --rev . --rev 2
 M a
 A x/x
   y/x
 A x/y
 R y/x
 
 diff --git a/a b/a
 --- a/a
 +++ b/a
 @@ -1,2 +1,3 @@
  a
 -7
 +m1
 +m2
 diff --git a/y/x b/x/x
 rename from y/x
 rename to x/x
 --- a/y/x
 +++ b/x/x
 @@ -1,2 +1,1 @@
  x
 -x1
 diff --git a/x/y b/x/y
 new file mode 100644
 --- /dev/null
 +++ b/x/y
 @@ -0,0 +1,1 @@
 +y1
 
 
+% testing copies with unrelated branch
+adding a
+0 files updated, 0 files merged, 1 files removed, 0 files unresolved
+adding a
+created new head
+% unrelated branch diff
+diff --git a/a b/a
+deleted file mode 100644
+--- a/a
++++ /dev/null
+@@ -1,1 +0,0 @@
+-a
+diff --git a/b b/b
+new file mode 100644
+--- /dev/null
++++ b/b
+@@ -0,0 +1,1 @@
++a