Show More
@@ -1,115 +1,165 b'' | |||||
1 | $ mkdir t |
|
1 | $ mkdir t | |
2 | $ cd t |
|
2 | $ cd t | |
3 | $ hg init |
|
3 | $ hg init | |
4 |
|
4 | |||
5 | $ mkdir a |
|
5 | $ mkdir a | |
6 | $ echo foo > a/a |
|
6 | $ echo foo > a/a | |
7 | $ echo bar > a/b |
|
7 | $ echo bar > a/b | |
8 | $ hg ci -Am "0" |
|
8 | $ hg ci -Am "0" | |
9 | adding a/a |
|
9 | adding a/a | |
10 | adding a/b |
|
10 | adding a/b | |
11 |
|
11 | |||
12 | $ hg co -C 0 |
|
12 | $ hg co -C 0 | |
13 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | $ hg mv a b |
|
14 | $ hg mv a b | |
15 | moving a/a to b/a |
|
15 | moving a/a to b/a | |
16 | moving a/b to b/b |
|
16 | moving a/b to b/b | |
17 | $ hg ci -m "1 mv a/ b/" |
|
17 | $ hg ci -m "1 mv a/ b/" | |
18 |
|
18 | |||
19 | $ hg co -C 0 |
|
19 | $ hg co -C 0 | |
20 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
20 | 2 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
21 | $ echo baz > a/c |
|
21 | $ echo baz > a/c | |
22 | $ echo quux > a/d |
|
22 | $ echo quux > a/d | |
23 | $ hg add a/c |
|
23 | $ hg add a/c | |
24 | $ hg ci -m "2 add a/c" |
|
24 | $ hg ci -m "2 add a/c" | |
25 | created new head |
|
25 | created new head | |
26 |
|
26 | |||
27 | $ hg merge --debug 1 |
|
27 | $ hg merge --debug 1 | |
28 | searching for copies back to rev 1 |
|
28 | searching for copies back to rev 1 | |
29 | unmatched files in local: |
|
29 | unmatched files in local: | |
30 | a/c |
|
30 | a/c | |
31 | a/d |
|
31 | a/d | |
32 | unmatched files in other: |
|
32 | unmatched files in other: | |
33 | b/a |
|
33 | b/a | |
34 | b/b |
|
34 | b/b | |
35 | all copies found (* = to merge, ! = divergent): |
|
35 | all copies found (* = to merge, ! = divergent): | |
36 | b/a -> a/a |
|
36 | b/a -> a/a | |
37 | b/b -> a/b |
|
37 | b/b -> a/b | |
38 | checking for directory renames |
|
38 | checking for directory renames | |
39 | dir a/ -> b/ |
|
39 | dir a/ -> b/ | |
40 | file a/c -> b/c |
|
40 | file a/c -> b/c | |
41 | file a/d -> b/d |
|
41 | file a/d -> b/d | |
42 | resolving manifests |
|
42 | resolving manifests | |
43 | overwrite None partial False |
|
43 | overwrite None partial False | |
44 | ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740 |
|
44 | ancestor f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740 | |
45 | a/d: remote renamed directory to b/d -> d |
|
45 | a/d: remote renamed directory to b/d -> d | |
46 | a/c: remote renamed directory to b/c -> d |
|
46 | a/c: remote renamed directory to b/c -> d | |
47 | a/b: other deleted -> r |
|
47 | a/b: other deleted -> r | |
48 | a/a: other deleted -> r |
|
48 | a/a: other deleted -> r | |
49 | b/a: remote created -> g |
|
49 | b/a: remote created -> g | |
50 | b/b: remote created -> g |
|
50 | b/b: remote created -> g | |
51 | updating: a/a 1/6 files (16.67%) |
|
51 | updating: a/a 1/6 files (16.67%) | |
52 | removing a/a |
|
52 | removing a/a | |
53 | updating: a/b 2/6 files (33.33%) |
|
53 | updating: a/b 2/6 files (33.33%) | |
54 | removing a/b |
|
54 | removing a/b | |
55 | updating: a/c 3/6 files (50.00%) |
|
55 | updating: a/c 3/6 files (50.00%) | |
56 | moving a/c to b/c |
|
56 | moving a/c to b/c | |
57 | updating: a/d 4/6 files (66.67%) |
|
57 | updating: a/d 4/6 files (66.67%) | |
58 | moving a/d to b/d |
|
58 | moving a/d to b/d | |
59 | updating: b/a 5/6 files (83.33%) |
|
59 | updating: b/a 5/6 files (83.33%) | |
60 | getting b/a |
|
60 | getting b/a | |
61 | updating: b/b 6/6 files (100.00%) |
|
61 | updating: b/b 6/6 files (100.00%) | |
62 | getting b/b |
|
62 | getting b/b | |
63 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
63 | 4 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
64 | (branch merge, don't forget to commit) |
|
64 | (branch merge, don't forget to commit) | |
65 |
|
65 | |||
66 | $ echo a/* b/* |
|
66 | $ echo a/* b/* | |
67 | a/* b/a b/b b/c b/d |
|
67 | a/* b/a b/b b/c b/d | |
68 | $ hg st -C |
|
68 | $ hg st -C | |
69 | M b/a |
|
69 | M b/a | |
70 | M b/b |
|
70 | M b/b | |
71 | A b/c |
|
71 | A b/c | |
72 | a/c |
|
72 | a/c | |
73 | R a/a |
|
73 | R a/a | |
74 | R a/b |
|
74 | R a/b | |
75 | R a/c |
|
75 | R a/c | |
76 | ? b/d |
|
76 | ? b/d | |
77 | $ hg ci -m "3 merge 2+1" |
|
77 | $ hg ci -m "3 merge 2+1" | |
78 | $ hg debugrename b/c |
|
78 | $ hg debugrename b/c | |
79 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
|
79 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | |
80 |
|
80 | |||
81 | $ hg co -C 1 |
|
81 | $ hg co -C 1 | |
82 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
82 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
83 | $ hg merge --debug 2 |
|
83 | $ hg merge --debug 2 | |
84 | searching for copies back to rev 1 |
|
84 | searching for copies back to rev 1 | |
85 | unmatched files in local: |
|
85 | unmatched files in local: | |
86 | b/a |
|
86 | b/a | |
87 | b/b |
|
87 | b/b | |
88 | b/d |
|
88 | b/d | |
89 | unmatched files in other: |
|
89 | unmatched files in other: | |
90 | a/c |
|
90 | a/c | |
91 | all copies found (* = to merge, ! = divergent): |
|
91 | all copies found (* = to merge, ! = divergent): | |
92 | b/a -> a/a |
|
92 | b/a -> a/a | |
93 | b/b -> a/b |
|
93 | b/b -> a/b | |
94 | checking for directory renames |
|
94 | checking for directory renames | |
95 | dir a/ -> b/ |
|
95 | dir a/ -> b/ | |
96 | file a/c -> b/c |
|
96 | file a/c -> b/c | |
97 | resolving manifests |
|
97 | resolving manifests | |
98 | overwrite None partial False |
|
98 | overwrite None partial False | |
99 | ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb |
|
99 | ancestor f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb | |
100 | None: local renamed directory to b/c -> d |
|
100 | None: local renamed directory to b/c -> d | |
101 | updating:None 1/1 files (100.00%) |
|
101 | updating:None 1/1 files (100.00%) | |
102 | getting a/c to b/c |
|
102 | getting a/c to b/c | |
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
103 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
104 | (branch merge, don't forget to commit) |
|
104 | (branch merge, don't forget to commit) | |
105 |
|
105 | |||
106 | $ echo a/* b/* |
|
106 | $ echo a/* b/* | |
107 | a/* b/a b/b b/c b/d |
|
107 | a/* b/a b/b b/c b/d | |
108 | $ hg st -C |
|
108 | $ hg st -C | |
109 | A b/c |
|
109 | A b/c | |
110 | a/c |
|
110 | a/c | |
111 | ? b/d |
|
111 | ? b/d | |
112 | $ hg ci -m "4 merge 1+2" |
|
112 | $ hg ci -m "4 merge 1+2" | |
113 | created new head |
|
113 | created new head | |
114 | $ hg debugrename b/c |
|
114 | $ hg debugrename b/c | |
115 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 |
|
115 | b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88 | |
|
116 | ||||
|
117 | ||||
|
118 | Second scenario with two repos: | |||
|
119 | ||||
|
120 | $ cd .. | |||
|
121 | $ mkdir r1 | |||
|
122 | $ cd r1 | |||
|
123 | $ hg init | |||
|
124 | $ mkdir a | |||
|
125 | $ echo foo > a/f | |||
|
126 | $ hg add a | |||
|
127 | adding a/f | |||
|
128 | $ hg ci -m "a/f == foo" | |||
|
129 | $ cd .. | |||
|
130 | ||||
|
131 | $ hg clone r1 r2 | |||
|
132 | updating to branch default | |||
|
133 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
134 | $ cd r2 | |||
|
135 | $ hg mv a b | |||
|
136 | moving a/f to b/f | |||
|
137 | $ echo foo1 > b/f | |||
|
138 | $ hg ci -m" a -> b, b/f == foo1" | |||
|
139 | $ cd .. | |||
|
140 | ||||
|
141 | $ cd r1 | |||
|
142 | $ mkdir a/aa | |||
|
143 | $ echo bar > a/aa/g | |||
|
144 | $ hg add a/aa | |||
|
145 | adding a/aa/g | |||
|
146 | $ hg ci -m "a/aa/g" | |||
|
147 | $ hg pull ../r2 | |||
|
148 | pulling from ../r2 | |||
|
149 | searching for changes | |||
|
150 | adding changesets | |||
|
151 | adding manifests | |||
|
152 | adding file changes | |||
|
153 | added 1 changesets with 1 changes to 1 files (+1 heads) | |||
|
154 | (run 'hg heads' to see heads, 'hg merge' to merge) | |||
|
155 | ||||
|
156 | $ hg merge | |||
|
157 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
158 | (branch merge, don't forget to commit) | |||
|
159 | ||||
|
160 | $ hg st -C | |||
|
161 | M b/f | |||
|
162 | A b/aa/g | |||
|
163 | a/aa/g | |||
|
164 | R a/aa/g | |||
|
165 | R a/f |
1 | NO CONTENT: file was removed |
|
NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now