Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-issue522.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 90d9ec0dc69d
children 8feb33c2d153
line wrap: on
line diff
--- a/tests/test-issue522.out
+++ b/tests/test-issue522.out
@@ -4,6 +4,9 @@ 1 files updated, 0 files merged, 0 files
 resolving manifests
  overwrite None partial False
  ancestor bbd179dfa0a7 local 71766447bdbb+ remote 4d9e78aaceee
+  searching for copies back to rev 1
+  unmatched files in local:
+   bar
  foo: remote is newer -> g
 getting foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved