86 |
86 |
87 $ echo foo > e |
87 $ echo foo > e |
88 $ hg ci -Aqm "added e" |
88 $ hg ci -Aqm "added e" |
89 $ hg prev |
89 $ hg prev |
90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
90 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
91 [6] added d |
91 [7] added d |
92 $ echo bar > e |
92 $ echo bar > e |
93 $ hg add e |
93 $ hg add e |
94 $ hg amend |
94 $ hg amend |
95 1 new orphan changesets |
95 1 new unstable changesets |
96 |
96 |
97 $ hg glog |
97 $ hg glog |
98 @ 8:00a5c774cc37 added d |
98 @ 10:00a5c774cc37 added d |
99 | () draft |
99 | () draft |
100 | o 7:ad0a59d83efe added e |
100 | o 8:ad0a59d83efe added e |
101 | | () draft |
101 | | () draft |
102 | x 6:2a4e03d422e2 added d |
102 | x 7:2a4e03d422e2 added d |
103 |/ () draft |
103 |/ () draft |
104 o 5:cb6a2ab625bb added c |
104 o 6:cb6a2ab625bb added c |
105 | () draft |
105 | () draft |
106 o 2:b1661037fa25 added b |
106 o 2:b1661037fa25 added b |
107 | () draft |
107 | () draft |
108 o 1:c7586e2a9264 added a |
108 o 1:c7586e2a9264 added a |
109 | () draft |
109 | () draft |
110 o 0:8fa14d15e168 added hgignore |
110 o 0:8fa14d15e168 added hgignore |
111 () draft |
111 () draft |
112 |
112 |
113 $ hg evolve |
113 $ hg evolve |
114 move:[7] added e |
114 move:[8] added e |
115 atop:[8] added d |
115 atop:[10] added d |
116 merging e |
116 merging e |
117 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
117 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
118 fix conflicts and see `hg help evolve.interrupted` |
118 fix conflicts and see `hg help evolve.interrupted` |
119 [1] |
119 [1] |
120 |
120 |
123 (no more unresolved files) |
123 (no more unresolved files) |
124 continue: hg evolve --continue |
124 continue: hg evolve --continue |
125 $ hg diff |
125 $ hg diff |
126 |
126 |
127 $ hg evolve --continue |
127 $ hg evolve --continue |
128 evolving 7:ad0a59d83efe "added e" |
128 evolving 8:ad0a59d83efe "added e" |
129 evolution of 7:ad0a59d83efe created no changes to commit |
129 evolution of 8:ad0a59d83efe created no changes to commit |
130 |
130 |
131 $ hg glog |
131 $ hg glog |
132 @ 8:00a5c774cc37 added d |
132 @ 10:00a5c774cc37 added d |
133 | () draft |
133 | () draft |
134 o 5:cb6a2ab625bb added c |
134 o 6:cb6a2ab625bb added c |
135 | () draft |
135 | () draft |
136 o 2:b1661037fa25 added b |
136 o 2:b1661037fa25 added b |
137 | () draft |
137 | () draft |
138 o 1:c7586e2a9264 added a |
138 o 1:c7586e2a9264 added a |
139 | () draft |
139 | () draft |
161 $ hg resolve -m |
161 $ hg resolve -m |
162 (no more unresolved files) |
162 (no more unresolved files) |
163 continue: hg evolve --continue |
163 continue: hg evolve --continue |
164 $ hg evolve --continue |
164 $ hg evolve --continue |
165 evolving 2:b1661037fa25 "added b" |
165 evolving 2:b1661037fa25 "added b" |
166 move:[5] added c |
166 move:[6] added c |
167 atop:[10] added b |
167 atop:[13] added b |
168 move:[8] added d |
168 move:[10] added d |
169 atop:[11] added c |
169 atop:[14] added c |
170 working directory is now at 6642d2c9176e |
170 working directory is now at 6642d2c9176e |
171 |
171 |
172 $ hg glog |
172 $ hg glog |
173 @ 12:6642d2c9176e added d |
173 @ 15:6642d2c9176e added d |
174 | () draft |
174 | () draft |
175 o 11:95665a2de664 added c |
175 o 14:95665a2de664 added c |
176 | () draft |
176 | () draft |
177 o 10:87f748868183 added b |
177 o 13:87f748868183 added b |
178 | () draft |
178 | () draft |
179 o 9:53b632d203d8 added a |
179 o 12:53b632d203d8 added a |
180 | () draft |
180 | () draft |
181 o 0:8fa14d15e168 added hgignore |
181 o 0:8fa14d15e168 added hgignore |
182 () draft |
182 () draft |
183 |
183 |
184 Conlicts -> resolve -> continue -> conflicts -> resolve -> continue |
184 Conlicts -> resolve -> continue -> conflicts -> resolve -> continue |
185 Test multiple conflicts in one evolve |
185 Test multiple conflicts in one evolve |
186 |
186 |
187 $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done; |
187 $ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done; |
188 |
188 |
189 $ hg glog |
189 $ hg glog |
190 @ 15:09becba8f97d added h |
190 @ 18:09becba8f97d added h |
191 | () draft |
191 | () draft |
192 o 14:5aa7b2bbd944 added g |
192 o 17:5aa7b2bbd944 added g |
193 | () draft |
193 | () draft |
194 o 13:be88f889b6dc added f |
194 o 16:be88f889b6dc added f |
195 | () draft |
195 | () draft |
196 o 12:6642d2c9176e added d |
196 o 15:6642d2c9176e added d |
197 | () draft |
197 | () draft |
198 o 11:95665a2de664 added c |
198 o 14:95665a2de664 added c |
199 | () draft |
199 | () draft |
200 o 10:87f748868183 added b |
200 o 13:87f748868183 added b |
201 | () draft |
201 | () draft |
202 o 9:53b632d203d8 added a |
202 o 12:53b632d203d8 added a |
203 | () draft |
203 | () draft |
204 o 0:8fa14d15e168 added hgignore |
204 o 0:8fa14d15e168 added hgignore |
205 () draft |
205 () draft |
206 |
206 |
207 $ hg up 95665a2de664 |
207 $ hg up 95665a2de664 |
209 |
209 |
210 $ echo bar > f |
210 $ echo bar > f |
211 $ echo bar > h |
211 $ echo bar > h |
212 $ hg add f h |
212 $ hg add f h |
213 $ hg amend |
213 $ hg amend |
214 4 new orphan changesets |
214 4 new unstable changesets |
215 |
215 |
216 $ hg glog |
216 $ hg glog |
217 @ 16:645135c5caa4 added c |
217 @ 20:645135c5caa4 added c |
218 | () draft |
218 | () draft |
219 | o 15:09becba8f97d added h |
219 | o 18:09becba8f97d added h |
220 | | () draft |
220 | | () draft |
221 | o 14:5aa7b2bbd944 added g |
221 | o 17:5aa7b2bbd944 added g |
222 | | () draft |
222 | | () draft |
223 | o 13:be88f889b6dc added f |
223 | o 16:be88f889b6dc added f |
224 | | () draft |
224 | | () draft |
225 | o 12:6642d2c9176e added d |
225 | o 15:6642d2c9176e added d |
226 | | () draft |
226 | | () draft |
227 | x 11:95665a2de664 added c |
227 | x 14:95665a2de664 added c |
228 |/ () draft |
228 |/ () draft |
229 o 10:87f748868183 added b |
229 o 13:87f748868183 added b |
230 | () draft |
230 | () draft |
231 o 9:53b632d203d8 added a |
231 o 12:53b632d203d8 added a |
232 | () draft |
232 | () draft |
233 o 0:8fa14d15e168 added hgignore |
233 o 0:8fa14d15e168 added hgignore |
234 () draft |
234 () draft |
235 |
235 |
236 $ hg evolve --all |
236 $ hg evolve --all |
237 move:[12] added d |
237 move:[15] added d |
238 atop:[16] added c |
238 atop:[20] added c |
239 move:[13] added f |
239 move:[16] added f |
240 atop:[17] added d |
240 atop:[21] added d |
241 merging f |
241 merging f |
242 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
242 warning: conflicts while merging f! (edit, then use 'hg resolve --mark') |
243 fix conflicts and see `hg help evolve.interrupted` |
243 fix conflicts and see `hg help evolve.interrupted` |
244 [1] |
244 [1] |
245 |
245 |
246 $ echo foo > f |
246 $ echo foo > f |
247 $ hg resolve -m |
247 $ hg resolve -m |
248 (no more unresolved files) |
248 (no more unresolved files) |
249 continue: hg evolve --continue |
249 continue: hg evolve --continue |
250 $ hg evolve --continue |
250 $ hg evolve --continue |
251 evolving 13:be88f889b6dc "added f" |
251 evolving 16:be88f889b6dc "added f" |
252 move:[14] added g |
252 move:[17] added g |
253 atop:[18] added f |
253 atop:[22] added f |
254 move:[15] added h |
254 move:[18] added h |
255 atop:[19] added g |
255 atop:[23] added g |
256 merging h |
256 merging h |
257 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
257 warning: conflicts while merging h! (edit, then use 'hg resolve --mark') |
258 fix conflicts and see `hg help evolve.interrupted` |
258 fix conflicts and see `hg help evolve.interrupted` |
259 [1] |
259 [1] |
260 |
260 |
261 $ echo foo > h |
261 $ echo foo > h |
262 $ hg resolve -m |
262 $ hg resolve -m |
263 (no more unresolved files) |
263 (no more unresolved files) |
264 continue: hg evolve --continue |
264 continue: hg evolve --continue |
265 $ hg evolve --continue |
265 $ hg evolve --continue |
266 evolving 15:09becba8f97d "added h" |
266 evolving 18:09becba8f97d "added h" |
267 working directory is now at 3ba9d3d1b089 |
267 working directory is now at 3ba9d3d1b089 |
268 |
268 |
269 Make sure, confirmopt is respected while continue |
269 Make sure, confirmopt is respected while continue |
270 |
270 |
271 $ hg glog |
271 $ hg glog |
272 @ 20:3ba9d3d1b089 added h |
272 @ 24:3ba9d3d1b089 added h |
273 | () draft |
273 | () draft |
274 o 19:981e615b14ca added g |
274 o 23:981e615b14ca added g |
275 | () draft |
275 | () draft |
276 o 18:5794f1a3cbb2 added f |
276 o 22:5794f1a3cbb2 added f |
277 | () draft |
277 | () draft |
278 o 17:e47537da02b3 added d |
278 o 21:e47537da02b3 added d |
279 | () draft |
279 | () draft |
280 o 16:645135c5caa4 added c |
280 o 20:645135c5caa4 added c |
281 | () draft |
281 | () draft |
282 o 10:87f748868183 added b |
282 o 13:87f748868183 added b |
283 | () draft |
283 | () draft |
284 o 9:53b632d203d8 added a |
284 o 12:53b632d203d8 added a |
285 | () draft |
285 | () draft |
286 o 0:8fa14d15e168 added hgignore |
286 o 0:8fa14d15e168 added hgignore |
287 () draft |
287 () draft |
288 |
288 |
289 $ hg up 5794f1a3cbb2 |
289 $ hg up 5794f1a3cbb2 |
290 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
290 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
291 $ echo bar > g |
291 $ echo bar > g |
292 $ hg add g |
292 $ hg add g |
293 $ hg amend |
293 $ hg amend |
294 2 new orphan changesets |
294 2 new unstable changesets |
295 |
295 |
296 $ hg evolve --all --confirm<<EOF |
296 $ hg evolve --all --confirm<<EOF |
297 > y |
297 > y |
298 > EOF |
298 > EOF |
299 move:[19] added g |
299 move:[23] added g |
300 atop:[21] added f |
300 atop:[26] added f |
301 perform evolve? [Ny] y |
301 perform evolve? [Ny] y |
302 merging g |
302 merging g |
303 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
303 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
304 fix conflicts and see `hg help evolve.interrupted` |
304 fix conflicts and see `hg help evolve.interrupted` |
305 [1] |
305 [1] |
312 XXX: this should have asked for confirmation |
312 XXX: this should have asked for confirmation |
313 |
313 |
314 $ hg evolve --continue<<EOF |
314 $ hg evolve --continue<<EOF |
315 > y |
315 > y |
316 > EOF |
316 > EOF |
317 evolving 19:981e615b14ca "added g" |
317 evolving 23:981e615b14ca "added g" |
318 move:[20] added h |
318 move:[24] added h |
319 atop:[22] added g |
319 atop:[27] added g |
320 perform evolve? [Ny] y |
320 perform evolve? [Ny] y |
321 working directory is now at af6bd002a48d |
321 working directory is now at af6bd002a48d |
322 |
322 |
323 $ hg glog |
323 $ hg glog |
324 @ 23:af6bd002a48d added h |
324 @ 28:af6bd002a48d added h |
325 | () draft |
325 | () draft |
326 o 22:d2c94a8f44bd added g |
326 o 27:d2c94a8f44bd added g |
327 | () draft |
327 | () draft |
328 o 21:9849fa96c885 added f |
328 o 26:9849fa96c885 added f |
329 | () draft |
329 | () draft |
330 o 17:e47537da02b3 added d |
330 o 21:e47537da02b3 added d |
331 | () draft |
331 | () draft |
332 o 16:645135c5caa4 added c |
332 o 20:645135c5caa4 added c |
333 | () draft |
333 | () draft |
334 o 10:87f748868183 added b |
334 o 13:87f748868183 added b |
335 | () draft |
335 | () draft |
336 o 9:53b632d203d8 added a |
336 o 12:53b632d203d8 added a |
337 | () draft |
337 | () draft |
338 o 0:8fa14d15e168 added hgignore |
338 o 0:8fa14d15e168 added hgignore |
339 () draft |
339 () draft |
340 |
340 |
341 Testing `evolve --continue` after `hg next --evolve` |
341 Testing `evolve --continue` after `hg next --evolve` |
342 |
342 |
343 $ hg up .^^ |
343 $ hg up .^^ |
344 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
344 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
345 $ echo foobar > g |
345 $ echo foobar > g |
346 $ hg amend |
346 $ hg amend |
347 2 new orphan changesets |
347 2 new unstable changesets |
348 |
348 |
349 $ hg next --evolve |
349 $ hg next --evolve |
350 move:[22] added g |
350 move:[27] added g |
351 atop:[24] added f |
351 atop:[30] added f |
352 merging g |
352 merging g |
353 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
353 warning: conflicts while merging g! (edit, then use 'hg resolve --mark') |
354 fix conflicts and see `hg help evolve.interrupted` |
354 fix conflicts and see `hg help evolve.interrupted` |
355 [1] |
355 [1] |
356 $ echo foo > g |
356 $ echo foo > g |
357 $ hg resolve -m |
357 $ hg resolve -m |
358 (no more unresolved files) |
358 (no more unresolved files) |
359 continue: hg evolve --continue |
359 continue: hg evolve --continue |
360 $ hg evolve --continue |
360 $ hg evolve --continue |
361 evolving 22:d2c94a8f44bd "added g" |
361 evolving 27:d2c94a8f44bd "added g" |