Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-rename-merge1.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 f191bc3916f7
children
line wrap: on
line diff
--- a/tests/test-rename-merge1.out
+++ b/tests/test-rename-merge1.out
@@ -4,6 +4,17 @@ merge
 resolving manifests
  overwrite None partial False
  ancestor af1939970a1c local f26ec4fc3fa3+ remote 8e765a822af2
+  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
  a: remote moved to b -> m
  b2: remote created -> g