Mercurial > hg

diff tests/test-issue612.t @ 16094:0776a6cababe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: don't use unknown() This removes use of unknown files for building the synthetic working directory manifest used by manifestmerge. Instead, we adopt the strategy used by _checkunknown. Side-effect: unknown files are no longer moved by remote directory renames, and now are left alone like ignored files.
author Matt Mackall <mpm@selenic.com>
date Thu, 09 Feb 2012 17:04:17 -0600
parents 9910f60a37ee
children 2fc86d92c4a9
line wrap: on
line diff
--- a/tests/test-issue612.t	Thu Feb 09 16:50:19 2012 -0600
+++ b/tests/test-issue612.t	Thu Feb 09 17:04:17 2012 -0600
@@ -24,11 +24,11 @@
 
   $ hg merge
   merging src/a.c and source/a.c to source/a.c
-  1 files updated, 1 files merged, 0 files removed, 0 files unresolved
+  0 files updated, 1 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg status
   M source/a.c
   R src/a.c
-  ? source/a.o
+  ? src/a.o