Mercurial > hg
comparison tests/test-rename-dir-merge.out @ 8753:af5f099d932b
merge: refactor manifestmerge init to better report effective ancestor
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 08 Jun 2009 18:14:44 -0500 |
parents | 4b0c9c674707 |
children | ba5e508b5e92 |
comparison
equal
deleted
inserted
replaced
8752:f177bdab261b | 8753:af5f099d932b |
---|---|
3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 3 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
4 moving a/a to b/a | 4 moving a/a to b/a |
5 moving a/b to b/b | 5 moving a/b to b/b |
6 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | 6 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
7 created new head | 7 created new head |
8 resolving manifests | |
9 overwrite None partial False | |
10 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 | |
11 searching for copies back to rev 1 | 8 searching for copies back to rev 1 |
12 unmatched files in local: | 9 unmatched files in local: |
13 a/c | 10 a/c |
14 a/d | 11 a/d |
15 unmatched files in other: | 12 unmatched files in other: |
20 b/b -> a/b | 17 b/b -> a/b |
21 checking for directory renames | 18 checking for directory renames |
22 dir a/ -> b/ | 19 dir a/ -> b/ |
23 file a/c -> b/c | 20 file a/c -> b/c |
24 file a/d -> b/d | 21 file a/d -> b/d |
22 resolving manifests | |
23 overwrite None partial False | |
24 ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 55119e611c80 | |
25 a/d: remote renamed directory to b/d -> d | 25 a/d: remote renamed directory to b/d -> d |
26 a/c: remote renamed directory to b/c -> d | 26 a/c: remote renamed directory to b/c -> d |
27 a/b: other deleted -> r | 27 a/b: other deleted -> r |
28 a/a: other deleted -> r | 28 a/a: other deleted -> r |
29 b/a: remote created -> g | 29 b/a: remote created -> g |
45 R a/b | 45 R a/b |
46 R a/c | 46 R a/c |
47 ? b/d | 47 ? b/d |
48 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | 48 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
49 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 49 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
50 resolving manifests | |
51 overwrite None partial False | |
52 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | |
53 searching for copies back to rev 1 | 50 searching for copies back to rev 1 |
54 unmatched files in local: | 51 unmatched files in local: |
55 b/a | 52 b/a |
56 b/b | 53 b/b |
57 b/d | 54 b/d |
61 b/a -> a/a | 58 b/a -> a/a |
62 b/b -> a/b | 59 b/b -> a/b |
63 checking for directory renames | 60 checking for directory renames |
64 dir a/ -> b/ | 61 dir a/ -> b/ |
65 file a/c -> b/c | 62 file a/c -> b/c |
63 resolving manifests | |
64 overwrite None partial False | |
65 ancestor f9b20c0d4c51 local 55119e611c80+ remote ce36d17b18fb | |
66 None: local renamed directory to b/c -> d | 66 None: local renamed directory to b/c -> d |
67 getting a/c to b/c | 67 getting a/c to b/c |
68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 68 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
69 (branch merge, don't forget to commit) | 69 (branch merge, don't forget to commit) |
70 a/* b/a b/b b/c b/d | 70 a/* b/a b/b b/c b/d |