Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-commit.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 e7282dede8cd
children
line wrap: on
line diff
--- a/tests/test-merge-commit.out
+++ b/tests/test-merge-commit.out
@@ -23,6 +23,7 @@ 0:2665aaee66e9
 resolving manifests
  overwrite None partial False
  ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1
+  searching for copies back to rev 1
  bar: versions differ -> m
 merging bar
 my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510
@@ -68,6 +69,7 @@ 0:2665aaee66e9
 resolving manifests
  overwrite None partial False
  ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897
+  searching for copies back to rev 1
  bar: versions differ -> m
 merging bar
 my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510