Mercurial > hg
comparison tests/test-issue612.t @ 16094:0776a6cababe
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 |
comparison
equal
deleted
inserted
replaced
16093:7e30f5f2285f | 16094:0776a6cababe |
---|---|
22 $ hg status | 22 $ hg status |
23 ? src/a.o | 23 ? src/a.o |
24 | 24 |
25 $ hg merge | 25 $ hg merge |
26 merging src/a.c and source/a.c to source/a.c | 26 merging src/a.c and source/a.c to source/a.c |
27 1 files updated, 1 files merged, 0 files removed, 0 files unresolved | 27 0 files updated, 1 files merged, 0 files removed, 0 files unresolved |
28 (branch merge, don't forget to commit) | 28 (branch merge, don't forget to commit) |
29 | 29 |
30 $ hg status | 30 $ hg status |
31 M source/a.c | 31 M source/a.c |
32 R src/a.c | 32 R src/a.c |
33 ? source/a.o | 33 ? src/a.o |
34 | 34 |