68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
68 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
69 [3] added c |
69 [3] added c |
70 $ echo bar > d |
70 $ echo bar > d |
71 $ hg add d |
71 $ hg add d |
72 $ hg amend |
72 $ hg amend |
73 1 new orphan changesets |
73 1 new unstable changesets |
74 $ hg glog |
74 $ hg glog |
75 @ 5:cb6a2ab625bb added c |
75 @ 6:cb6a2ab625bb added c |
76 | () draft |
76 | () draft |
77 | o 4:c41c793e0ef1 added d |
77 | o 4:c41c793e0ef1 added d |
78 | | () draft |
78 | | () draft |
79 | x 3:ca1b80f7960a added c |
79 | x 3:ca1b80f7960a added c |
80 |/ () draft |
80 |/ () draft |
85 o 0:8fa14d15e168 added hgignore |
85 o 0:8fa14d15e168 added hgignore |
86 () draft |
86 () draft |
87 |
87 |
88 $ hg evolve |
88 $ hg evolve |
89 move:[4] added d |
89 move:[4] added d |
90 atop:[5] added c |
90 atop:[6] added c |
91 merging d |
91 merging d |
92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
92 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
93 evolve failed! |
93 evolve failed! |
94 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
94 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
95 abort: unresolved merge conflicts (see hg help resolve) |
95 abort: unresolved merge conflicts (see hg help resolve) |
133 Testing the stop flag in case conflicts are caused by `hg next --evolve` |
133 Testing the stop flag in case conflicts are caused by `hg next --evolve` |
134 ======================================================================== |
134 ======================================================================== |
135 |
135 |
136 $ hg next --evolve |
136 $ hg next --evolve |
137 move:[4] added d |
137 move:[4] added d |
138 atop:[5] added c |
138 atop:[6] added c |
139 merging d |
139 merging d |
140 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
140 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
141 evolve failed! |
141 evolve failed! |
142 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
142 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
143 abort: unresolved merge conflicts (see hg help resolve) |
143 abort: unresolved merge conflicts (see hg help resolve) |
157 $ hg evolve --stop |
157 $ hg evolve --stop |
158 stopped the interrupted evolve |
158 stopped the interrupted evolve |
159 working directory is now at cb6a2ab625bb |
159 working directory is now at cb6a2ab625bb |
160 |
160 |
161 $ hg glog |
161 $ hg glog |
162 @ 5:cb6a2ab625bb added c |
162 @ 6:cb6a2ab625bb added c |
163 | () draft |
163 | () draft |
164 | o 4:c41c793e0ef1 added d |
164 | o 4:c41c793e0ef1 added d |
165 | | () draft |
165 | | () draft |
166 | x 3:ca1b80f7960a added c |
166 | x 3:ca1b80f7960a added c |
167 |/ () draft |
167 |/ () draft |
182 we do `evolve --stop` |
182 we do `evolve --stop` |
183 -------------------------------------------------------------------------------- |
183 -------------------------------------------------------------------------------- |
184 |
184 |
185 $ hg evolve |
185 $ hg evolve |
186 move:[4] added d |
186 move:[4] added d |
187 atop:[5] added c |
187 atop:[6] added c |
188 merging d |
188 merging d |
189 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
189 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
190 evolve failed! |
190 evolve failed! |
191 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
191 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
192 abort: unresolved merge conflicts (see hg help resolve) |
192 abort: unresolved merge conflicts (see hg help resolve) |
197 continue: hg evolve --continue |
197 continue: hg evolve --continue |
198 $ hg evolve --continue |
198 $ hg evolve --continue |
199 evolving 4:c41c793e0ef1 "added d" |
199 evolving 4:c41c793e0ef1 "added d" |
200 working directory is now at 2a4e03d422e2 |
200 working directory is now at 2a4e03d422e2 |
201 $ hg glog |
201 $ hg glog |
202 @ 6:2a4e03d422e2 added d |
202 @ 7:2a4e03d422e2 added d |
203 | () draft |
203 | () draft |
204 o 5:cb6a2ab625bb added c |
204 o 6:cb6a2ab625bb added c |
205 | () draft |
205 | () draft |
206 o 2:b1661037fa25 added b |
206 o 2:b1661037fa25 added b |
207 | () draft |
207 | () draft |
208 o 1:c7586e2a9264 added a |
208 o 1:c7586e2a9264 added a |
209 | () draft |
209 | () draft |
213 $ hg up .^^^^ |
213 $ hg up .^^^^ |
214 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
214 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
215 $ echo bar > c |
215 $ echo bar > c |
216 $ hg add c |
216 $ hg add c |
217 $ hg amend |
217 $ hg amend |
218 4 new orphan changesets |
218 4 new unstable changesets |
219 |
219 |
220 $ hg glog |
220 $ hg glog |
221 @ 7:21817cd42526 added hgignore |
221 @ 9:21817cd42526 added hgignore |
222 () draft |
222 () draft |
223 o 6:2a4e03d422e2 added d |
223 o 7:2a4e03d422e2 added d |
224 | () draft |
224 | () draft |
225 o 5:cb6a2ab625bb added c |
225 o 6:cb6a2ab625bb added c |
226 | () draft |
226 | () draft |
227 o 2:b1661037fa25 added b |
227 o 2:b1661037fa25 added b |
228 | () draft |
228 | () draft |
229 o 1:c7586e2a9264 added a |
229 o 1:c7586e2a9264 added a |
230 | () draft |
230 | () draft |
231 x 0:8fa14d15e168 added hgignore |
231 x 0:8fa14d15e168 added hgignore |
232 () draft |
232 () draft |
233 |
233 |
234 $ hg evolve --all |
234 $ hg evolve --all |
235 move:[1] added a |
235 move:[1] added a |
236 atop:[7] added hgignore |
236 atop:[9] added hgignore |
237 move:[2] added b |
237 move:[2] added b |
238 atop:[8] added a |
238 atop:[10] added a |
239 move:[5] added c |
239 move:[6] added c |
240 atop:[9] added b |
240 atop:[11] added b |
241 merging c |
241 merging c |
242 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
242 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
243 evolve failed! |
243 evolve failed! |
244 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
244 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
245 abort: unresolved merge conflicts (see hg help resolve) |
245 abort: unresolved merge conflicts (see hg help resolve) |
253 stopped the interrupted evolve |
253 stopped the interrupted evolve |
254 working directory is now at aec285328e90 |
254 working directory is now at aec285328e90 |
255 |
255 |
256 Only changeset which has a successor now are obsoleted |
256 Only changeset which has a successor now are obsoleted |
257 $ hg glog |
257 $ hg glog |
258 @ 9:aec285328e90 added b |
258 @ 11:aec285328e90 added b |
259 | () draft |
259 | () draft |
260 o 8:fd00db71edca added a |
260 o 10:fd00db71edca added a |
261 | () draft |
261 | () draft |
262 o 7:21817cd42526 added hgignore |
262 o 9:21817cd42526 added hgignore |
263 () draft |
263 () draft |
264 o 6:2a4e03d422e2 added d |
264 o 7:2a4e03d422e2 added d |
265 | () draft |
265 | () draft |
266 o 5:cb6a2ab625bb added c |
266 o 6:cb6a2ab625bb added c |
267 | () draft |
267 | () draft |
268 x 2:b1661037fa25 added b |
268 x 2:b1661037fa25 added b |
269 | () draft |
269 | () draft |
270 x 1:c7586e2a9264 added a |
270 x 1:c7586e2a9264 added a |
271 | () draft |
271 | () draft |
273 () draft |
273 () draft |
274 |
274 |
275 Making sure doing evolve again resumes from right place and does the right thing |
275 Making sure doing evolve again resumes from right place and does the right thing |
276 |
276 |
277 $ hg evolve --all |
277 $ hg evolve --all |
278 move:[5] added c |
278 move:[6] added c |
279 atop:[9] added b |
279 atop:[11] added b |
280 merging c |
280 merging c |
281 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
281 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
282 evolve failed! |
282 evolve failed! |
283 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
283 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
284 abort: unresolved merge conflicts (see hg help resolve) |
284 abort: unresolved merge conflicts (see hg help resolve) |
287 $ echo foobar > c |
287 $ echo foobar > c |
288 $ hg resolve -m |
288 $ hg resolve -m |
289 (no more unresolved files) |
289 (no more unresolved files) |
290 continue: hg evolve --continue |
290 continue: hg evolve --continue |
291 $ hg evolve --continue |
291 $ hg evolve --continue |
292 evolving 5:cb6a2ab625bb "added c" |
292 evolving 6:cb6a2ab625bb "added c" |
293 move:[6] added d |
293 move:[7] added d |
294 atop:[10] added c |
294 atop:[12] added c |
295 working directory is now at cd0909a30222 |
295 working directory is now at cd0909a30222 |
296 $ hg glog |
296 $ hg glog |
297 @ 11:cd0909a30222 added d |
297 @ 13:cd0909a30222 added d |
298 | () draft |
298 | () draft |
299 o 10:cb1dd1086ef6 added c |
299 o 12:cb1dd1086ef6 added c |
300 | () draft |
300 | () draft |
301 o 9:aec285328e90 added b |
301 o 11:aec285328e90 added b |
302 | () draft |
302 | () draft |
303 o 8:fd00db71edca added a |
303 o 10:fd00db71edca added a |
304 | () draft |
304 | () draft |
305 o 7:21817cd42526 added hgignore |
305 o 9:21817cd42526 added hgignore |
306 () draft |
306 () draft |
307 |
307 |
308 Bookmarks should only be moved of the changesets which have been evolved, |
308 Bookmarks should only be moved of the changesets which have been evolved, |
309 bookmarks of rest of them should stay where they are are |
309 bookmarks of rest of them should stay where they are are |
310 ------------------------------------------------------------------------- |
310 ------------------------------------------------------------------------- |
316 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
316 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
317 (leaving bookmark b1) |
317 (leaving bookmark b1) |
318 $ hg bookmark b2 |
318 $ hg bookmark b2 |
319 |
319 |
320 $ hg glog |
320 $ hg glog |
321 o 11:cd0909a30222 added d |
321 o 13:cd0909a30222 added d |
322 | () draft |
322 | () draft |
323 o 10:cb1dd1086ef6 added c |
323 o 12:cb1dd1086ef6 added c |
324 | (b1) draft |
324 | (b1) draft |
325 @ 9:aec285328e90 added b |
325 @ 11:aec285328e90 added b |
326 | (b2) draft |
326 | (b2) draft |
327 o 8:fd00db71edca added a |
327 o 10:fd00db71edca added a |
328 | () draft |
328 | () draft |
329 o 7:21817cd42526 added hgignore |
329 o 9:21817cd42526 added hgignore |
330 () draft |
330 () draft |
331 |
331 |
332 $ hg prev |
332 $ hg prev |
333 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
333 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
334 [8] added a |
334 [10] added a |
335 $ echo tom > c |
335 $ echo tom > c |
336 $ hg amend |
336 $ hg amend |
337 3 new orphan changesets |
337 3 new unstable changesets |
338 |
338 |
339 $ hg glog |
339 $ hg glog |
340 @ 12:a3cc2042492f added a |
340 @ 15:a3cc2042492f added a |
341 | () draft |
341 | () draft |
342 | o 11:cd0909a30222 added d |
342 | o 13:cd0909a30222 added d |
343 | | () draft |
343 | | () draft |
344 | o 10:cb1dd1086ef6 added c |
344 | o 12:cb1dd1086ef6 added c |
345 | | (b1) draft |
345 | | (b1) draft |
346 | o 9:aec285328e90 added b |
346 | o 11:aec285328e90 added b |
347 | | (b2) draft |
347 | | (b2) draft |
348 | x 8:fd00db71edca added a |
348 | x 10:fd00db71edca added a |
349 |/ () draft |
349 |/ () draft |
350 o 7:21817cd42526 added hgignore |
350 o 9:21817cd42526 added hgignore |
351 () draft |
351 () draft |
352 |
352 |
353 $ hg evolve --all |
353 $ hg evolve --all |
354 move:[9] added b |
354 move:[11] added b |
355 atop:[12] added a |
355 atop:[15] added a |
356 move:[10] added c |
356 move:[12] added c |
357 atop:[13] added b |
357 atop:[16] added b |
358 merging c |
358 merging c |
359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
359 warning: conflicts while merging c! (edit, then use 'hg resolve --mark') |
360 evolve failed! |
360 evolve failed! |
361 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
361 fix conflict and run 'hg evolve --continue' or use 'hg evolve --abort' to abort |
362 abort: unresolved merge conflicts (see hg help resolve) |
362 abort: unresolved merge conflicts (see hg help resolve) |
366 stopped the interrupted evolve |
366 stopped the interrupted evolve |
367 working directory is now at a3f4b95da934 |
367 working directory is now at a3f4b95da934 |
368 |
368 |
369 Bookmarks of only the changeset which are evolved is moved |
369 Bookmarks of only the changeset which are evolved is moved |
370 $ hg glog |
370 $ hg glog |
371 @ 13:a3f4b95da934 added b |
371 @ 16:a3f4b95da934 added b |
372 | (b2) draft |
372 | (b2) draft |
373 o 12:a3cc2042492f added a |
373 o 15:a3cc2042492f added a |
374 | () draft |
374 | () draft |
375 | o 11:cd0909a30222 added d |
375 | o 13:cd0909a30222 added d |
376 | | () draft |
376 | | () draft |
377 | o 10:cb1dd1086ef6 added c |
377 | o 12:cb1dd1086ef6 added c |
378 | | (b1) draft |
378 | | (b1) draft |
379 | x 9:aec285328e90 added b |
379 | x 11:aec285328e90 added b |
380 | | () draft |
380 | | () draft |
381 | x 8:fd00db71edca added a |
381 | x 10:fd00db71edca added a |
382 |/ () draft |
382 |/ () draft |
383 o 7:21817cd42526 added hgignore |
383 o 9:21817cd42526 added hgignore |
384 () draft |
384 () draft |