Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-copy-move-merge.out @ 5371:17ed9b9a0d03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add debug diagnostics for findcopies
author Matt Mackall <mpm@selenic.com>
date Thu, 04 Oct 2007 19:44:37 -0500
parents 8d9bdcbb2b18
children
line wrap: on
line diff
--- a/tests/test-copy-move-merge.out
+++ b/tests/test-copy-move-merge.out
@@ -2,6 +2,14 @@ 1 files updated, 0 files merged, 2 files
 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