tests/test-copy-move-merge.out
author Matt Mackall <mpm@selenic.com>
Thu, 04 Oct 2007 19:44:37 -0500
changeset 5371 17ed9b9a0d03
parent 5059 8d9bdcbb2b18
child 6004 5af5f0f9d724
permissions -rw-r--r--
merge: add debug diagnostics for findcopies

1 files updated, 0 files merged, 2 files removed, 0 files unresolved
resolving manifests
 overwrite None partial False
 ancestor 583c7b748052 local fb3948d97f07+ remote 40da226db0f0
  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
 a: remote moved to c -> m
 a: remote moved to b -> m
copying a to b
copying a to c
merging a and b
my a@fb3948d97f07+ other b@40da226db0f0 ancestor a@583c7b748052
removing a
merging a and c
my a@fb3948d97f07+ other c@40da226db0f0 ancestor a@583c7b748052
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