25 |
25 |
26 $ hg merge --debug 1 |
26 $ hg merge --debug 1 |
27 searching for copies back to rev 1 |
27 searching for copies back to rev 1 |
28 unmatched files in local: |
28 unmatched files in local: |
29 a/c |
29 a/c |
30 a/d |
|
31 unmatched files in other: |
30 unmatched files in other: |
32 b/a |
31 b/a |
33 b/b |
32 b/b |
34 all copies found (* = to merge, ! = divergent): |
33 all copies found (* = to merge, ! = divergent): |
35 b/a -> a/a |
34 b/a -> a/a |
36 b/b -> a/b |
35 b/b -> a/b |
37 checking for directory renames |
36 checking for directory renames |
38 dir a/ -> b/ |
37 dir a/ -> b/ |
39 file a/c -> b/c |
38 file a/c -> b/c |
40 file a/d -> b/d |
|
41 resolving manifests |
39 resolving manifests |
42 overwrite: False, partial: False |
40 overwrite: False, partial: False |
43 ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
41 ancestor: f9b20c0d4c51, local: ce36d17b18fb+, remote: 397f8b00a740 |
44 a/d: remote renamed directory to b/d -> d |
|
45 a/c: remote renamed directory to b/c -> d |
42 a/c: remote renamed directory to b/c -> d |
46 a/b: other deleted -> r |
43 a/b: other deleted -> r |
47 a/a: other deleted -> r |
44 a/a: other deleted -> r |
48 b/a: remote created -> g |
45 b/a: remote created -> g |
49 b/b: remote created -> g |
46 b/b: remote created -> g |
50 updating: a/a 1/6 files (16.67%) |
47 updating: a/a 1/5 files (20.00%) |
51 removing a/a |
48 removing a/a |
52 updating: a/b 2/6 files (33.33%) |
49 updating: a/b 2/5 files (40.00%) |
53 removing a/b |
50 removing a/b |
54 updating: a/c 3/6 files (50.00%) |
51 updating: a/c 3/5 files (60.00%) |
55 moving a/c to b/c |
52 moving a/c to b/c |
56 updating: a/d 4/6 files (66.67%) |
53 updating: b/a 4/5 files (80.00%) |
57 moving a/d to b/d |
|
58 updating: b/a 5/6 files (83.33%) |
|
59 getting b/a |
54 getting b/a |
60 updating: b/b 6/6 files (100.00%) |
55 updating: b/b 5/5 files (100.00%) |
61 getting b/b |
56 getting b/b |
62 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
57 3 files updated, 0 files merged, 2 files removed, 0 files unresolved |
63 (branch merge, don't forget to commit) |
58 (branch merge, don't forget to commit) |
64 |
59 |
65 $ echo a/* b/* |
60 $ echo a/* b/* |
66 a/* b/a b/b b/c b/d |
61 a/d b/a b/b b/c |
67 $ hg st -C |
62 $ hg st -C |
68 M b/a |
63 M b/a |
69 M b/b |
64 M b/b |
70 A b/c |
65 A b/c |
71 a/c |
66 a/c |
72 R a/a |
67 R a/a |
73 R a/b |
68 R a/b |
74 R a/c |
69 R a/c |
75 ? b/d |
70 ? a/d |
76 $ hg ci -m "3 merge 2+1" |
71 $ hg ci -m "3 merge 2+1" |
77 $ hg debugrename b/c |
72 $ hg debugrename b/c |
78 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) |
73 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) |
79 |
74 |
80 $ hg co -C 1 |
75 $ hg co -C 1 |
101 getting a/c to b/c |
95 getting a/c to b/c |
102 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
96 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
103 (branch merge, don't forget to commit) |
97 (branch merge, don't forget to commit) |
104 |
98 |
105 $ echo a/* b/* |
99 $ echo a/* b/* |
106 a/* b/a b/b b/c b/d |
100 a/d b/a b/b b/c |
107 $ hg st -C |
101 $ hg st -C |
108 A b/c |
102 A b/c |
109 a/c |
103 a/c |
110 ? b/d |
104 ? a/d |
111 $ hg ci -m "4 merge 1+2" |
105 $ hg ci -m "4 merge 1+2" |
112 created new head |
106 created new head |
113 $ hg debugrename b/c |
107 $ hg debugrename b/c |
114 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) |
108 b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 (glob) |
115 |
109 |