70 $ hg evolve --all |
70 $ hg evolve --all |
71 move:[2] added b |
71 move:[2] added b |
72 atop:[6] watbar to a |
72 atop:[6] watbar to a |
73 move:[3] added c |
73 move:[3] added c |
74 move:[4] added d |
74 move:[4] added d |
75 working directory is now at 15c781f93cac |
75 $ hg glog |
76 $ hg glog |
76 o 9:15c781f93cac added d |
77 @ 9:15c781f93cac added d |
|
78 | () [default] draft |
77 | () [default] draft |
79 o 8:9e5fb1d5b955 added c |
78 o 8:9e5fb1d5b955 added c |
80 | () [default] draft |
79 | () [default] draft |
81 o 7:88516dccf68a added b |
80 o 7:88516dccf68a added b |
82 | () [default] draft |
81 | () [default] draft |
83 o 6:82b74d5dc678 watbar to a |
82 @ 6:82b74d5dc678 watbar to a |
84 | () [default] draft |
83 | () [default] draft |
85 o 0:8fa14d15e168 added hgignore |
84 o 0:8fa14d15e168 added hgignore |
86 () [default] draft |
85 () [default] draft |
87 |
86 |
88 $ cd ../stacktest |
87 $ cd ../stacktest |
94 $ hg evolve --all |
93 $ hg evolve --all |
95 move:[2] added b |
94 move:[2] added b |
96 atop:[5] watbar to a |
95 atop:[5] watbar to a |
97 move:[3] added c |
96 move:[3] added c |
98 move:[4] added d |
97 move:[4] added d |
99 working directory is now at c72d2885eb51 |
98 $ hg glog |
100 $ hg glog |
99 o 8:c72d2885eb51 added d |
101 @ 8:c72d2885eb51 added d |
|
102 | () [default] draft |
100 | () [default] draft |
103 o 7:3ce4be6d8e5e added c |
101 o 7:3ce4be6d8e5e added c |
104 | () [default] draft |
102 | () [default] draft |
105 o 6:d5f148423c16 added b |
103 o 6:d5f148423c16 added b |
106 | () [default] draft |
104 | () [default] draft |
107 o 5:8e222f257bbf watbar to a |
105 @ 5:8e222f257bbf watbar to a |
108 | () [default] draft |
106 | () [default] draft |
109 o 0:8fa14d15e168 added hgignore |
107 o 0:8fa14d15e168 added hgignore |
110 () [default] draft |
108 () [default] draft |
111 |
109 |
112 $ hg pull ../stack2 |
110 $ hg pull ../stack2 |
128 | () [default] draft |
126 | () [default] draft |
129 * 10:88516dccf68a added b |
127 * 10:88516dccf68a added b |
130 | () [default] draft |
128 | () [default] draft |
131 * 9:82b74d5dc678 watbar to a |
129 * 9:82b74d5dc678 watbar to a |
132 | () [default] draft |
130 | () [default] draft |
133 | @ 8:c72d2885eb51 added d |
131 | * 8:c72d2885eb51 added d |
134 | | () [default] draft |
132 | | () [default] draft |
135 | * 7:3ce4be6d8e5e added c |
133 | * 7:3ce4be6d8e5e added c |
136 | | () [default] draft |
134 | | () [default] draft |
137 | * 6:d5f148423c16 added b |
135 | * 6:d5f148423c16 added b |
138 | | () [default] draft |
136 | | () [default] draft |
139 | * 5:8e222f257bbf watbar to a |
137 | @ 5:8e222f257bbf watbar to a |
140 |/ () [default] draft |
138 |/ () [default] draft |
141 o 0:8fa14d15e168 added hgignore |
139 o 0:8fa14d15e168 added hgignore |
142 () [default] draft |
140 () [default] draft |
143 |
141 |
144 $ hg evolve --all --content-divergent |
142 $ hg evolve --all --content-divergent |
145 merge:[5] watbar to a |
143 merge:[5] watbar to a |
146 with: [9] watbar to a |
144 with: [9] watbar to a |
147 base: [1] added a |
145 base: [1] added a |
148 updating to "local" side of the conflict: 8e222f257bbf |
|
149 merging "other" content-divergent changeset '82b74d5dc678' |
146 merging "other" content-divergent changeset '82b74d5dc678' |
150 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
151 6 new orphan changesets |
148 6 new orphan changesets |
152 merge:[6] added b |
149 merge:[6] added b |
153 with: [10] added b |
150 with: [10] added b |
165 with: [12] added d |
162 with: [12] added d |
166 base: [4] added d |
163 base: [4] added d |
167 updating to "local" side of the conflict: c72d2885eb51 |
164 updating to "local" side of the conflict: c72d2885eb51 |
168 merging "other" content-divergent changeset '15c781f93cac' |
165 merging "other" content-divergent changeset '15c781f93cac' |
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
166 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
170 working directory is now at 038fe7db3d88 |
167 working directory is now at f66f262fff6c |
171 |
168 |
172 $ hg glog |
169 $ hg glog |
173 @ 16:038fe7db3d88 added d |
170 o 16:038fe7db3d88 added d |
174 | () [default] draft |
171 | () [default] draft |
175 o 15:b2cac10f3836 added c |
172 o 15:b2cac10f3836 added c |
176 | () [default] draft |
173 | () [default] draft |
177 o 14:eadfd9d70680 added b |
174 o 14:eadfd9d70680 added b |
178 | () [default] draft |
175 | () [default] draft |
179 o 13:f66f262fff6c watbar to a |
176 @ 13:f66f262fff6c watbar to a |
180 | () [default] draft |
177 | () [default] draft |
181 o 0:8fa14d15e168 added hgignore |
178 o 0:8fa14d15e168 added hgignore |
182 () [default] draft |
179 () [default] draft |
183 Resolving content-divergence of a stack with different parents |
180 Resolving content-divergence of a stack with different parents |
184 --------------------------------------------------------- |
181 --------------------------------------------------------- |
268 $ hg evolve --all |
265 $ hg evolve --all |
269 move:[2] added b |
266 move:[2] added b |
270 atop:[5] watbar to a |
267 atop:[5] watbar to a |
271 move:[3] added c |
268 move:[3] added c |
272 move:[4] added d |
269 move:[4] added d |
273 working directory is now at c72d2885eb51 |
270 |
274 |
271 $ hg glog |
275 $ hg glog |
272 o 8:c72d2885eb51 added d |
276 @ 8:c72d2885eb51 added d |
|
277 | () [default] draft |
273 | () [default] draft |
278 o 7:3ce4be6d8e5e added c |
274 o 7:3ce4be6d8e5e added c |
279 | () [default] draft |
275 | () [default] draft |
280 o 6:d5f148423c16 added b |
276 o 6:d5f148423c16 added b |
281 | () [default] draft |
277 | () [default] draft |
282 o 5:8e222f257bbf watbar to a |
278 @ 5:8e222f257bbf watbar to a |
283 | () [default] draft |
279 | () [default] draft |
284 o 0:8fa14d15e168 added hgignore |
280 o 0:8fa14d15e168 added hgignore |
285 () [default] draft |
281 () [default] draft |
286 |
282 |
287 $ hg pull ../stackrepo2 |
283 $ hg pull ../stackrepo2 |
305 | () [default] draft |
301 | () [default] draft |
306 * 10:c04ff147ef79 added a |
302 * 10:c04ff147ef79 added a |
307 | () [default] draft |
303 | () [default] draft |
308 o 9:2228e3b74514 add newfile |
304 o 9:2228e3b74514 add newfile |
309 | () [default] draft |
305 | () [default] draft |
310 | @ 8:c72d2885eb51 added d |
306 | * 8:c72d2885eb51 added d |
311 | | () [default] draft |
307 | | () [default] draft |
312 | * 7:3ce4be6d8e5e added c |
308 | * 7:3ce4be6d8e5e added c |
313 | | () [default] draft |
309 | | () [default] draft |
314 | * 6:d5f148423c16 added b |
310 | * 6:d5f148423c16 added b |
315 | | () [default] draft |
311 | | () [default] draft |
316 | * 5:8e222f257bbf watbar to a |
312 | @ 5:8e222f257bbf watbar to a |
317 |/ () [default] draft |
313 |/ () [default] draft |
318 o 0:8fa14d15e168 added hgignore |
314 o 0:8fa14d15e168 added hgignore |
319 () [default] draft |
315 () [default] draft |
320 |
316 |
321 $ hg evolve --all --content-divergent |
317 $ hg evolve --all --content-divergent |
346 base: [4] added d |
342 base: [4] added d |
347 rebasing "other" content-divergent changeset c72d2885eb51 on 8ed612937375 |
343 rebasing "other" content-divergent changeset c72d2885eb51 on 8ed612937375 |
348 updating to "local" side of the conflict: d45f050514c2 |
344 updating to "local" side of the conflict: d45f050514c2 |
349 merging "other" content-divergent changeset '1d1772990a3b' |
345 merging "other" content-divergent changeset '1d1772990a3b' |
350 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
346 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
351 working directory is now at 5f7a38bdb75c |
347 working directory is now at 74fbf3e6a0b6 |
352 |
348 |
353 $ hg glog |
349 $ hg glog |
354 @ 21:5f7a38bdb75c added d |
350 o 21:5f7a38bdb75c added d |
355 | () [default] draft |
351 | () [default] draft |
356 o 19:9865d598f0e0 added c |
352 o 19:9865d598f0e0 added c |
357 | () [default] draft |
353 | () [default] draft |
358 o 17:ac70b8c8eb63 added b |
354 o 17:ac70b8c8eb63 added b |
359 | () [default] draft |
355 | () [default] draft |
360 o 15:74fbf3e6a0b6 watbar to a |
356 @ 15:74fbf3e6a0b6 watbar to a |
361 | () [default] draft |
357 | () [default] draft |
362 o 9:2228e3b74514 add newfile |
358 o 9:2228e3b74514 add newfile |
363 | () [default] draft |
359 | () [default] draft |
364 o 0:8fa14d15e168 added hgignore |
360 o 0:8fa14d15e168 added hgignore |
365 () [default] draft |
361 () [default] draft |