Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-rename-dir-merge.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 dee573ba79f1
children
comparison
equal deleted inserted replaced
5370:61462e7d62ed 5371:17ed9b9a0d03
7 removing a/b 7 removing a/b
8 2 files updated, 0 files merged, 2 files removed, 0 files unresolved 8 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
9 resolving manifests 9 resolving manifests
10 overwrite None partial False 10 overwrite None partial False
11 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 11 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80
12 searching for copies back to rev 1
13 unmatched files in local:
14 a/c
15 unmatched files in other:
16 b/a
17 b/b
18 all copies found (* = to merge, ! = divergent):
19 b/a -> a/a
20 b/b -> a/b
21 checking for directory renames
22 dir a/ -> b/
23 file a/c -> b/c
12 a/c: remote renamed directory to b/c -> d 24 a/c: remote renamed directory to b/c -> d
13 a/b: other deleted -> r 25 a/b: other deleted -> r
14 a/a: other deleted -> r 26 a/a: other deleted -> r
15 b/a: remote created -> g 27 b/a: remote created -> g
16 b/b: remote created -> g 28 b/b: remote created -> g
32 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 44 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
33 0 files updated, 0 files merged, 1 files removed, 0 files unresolved 45 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
34 resolving manifests 46 resolving manifests
35 overwrite None partial False 47 overwrite None partial False
36 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb 48 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb
49 searching for copies back to rev 1
50 unmatched files in local:
51 b/a
52 b/b
53 unmatched files in other:
54 a/c
55 all copies found (* = to merge, ! = divergent):
56 b/a -> a/a
57 b/b -> a/b
58 checking for directory renames
59 dir a/ -> b/
60 file a/c -> b/c
37 None: local renamed directory to b/c -> d 61 None: local renamed directory to b/c -> d
38 getting a/c to b/c 62 getting a/c to b/c
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 63 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
40 (branch merge, don't forget to commit) 64 (branch merge, don't forget to commit)
41 a/* b/a b/b b/c 65 a/* b/a b/b b/c