52 |
52 |
53 $ echo bar > d |
53 $ echo bar > d |
54 $ hg amend |
54 $ hg amend |
55 |
55 |
56 $ hg up c41c793e0ef1 --hidden |
56 $ hg up c41c793e0ef1 --hidden |
57 updating to a hidden changeset c41c793e0ef1 |
|
58 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
|
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
57 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
60 working directory parent is obsolete! (c41c793e0ef1) |
58 working directory parent is obsolete! (c41c793e0ef1) |
61 (use 'hg evolve' to update to its successor: e49523854bc8) |
59 (use 'hg evolve' to update to its successor: e49523854bc8) |
62 |
60 |
63 $ echo foobar > d |
61 $ echo foobar > d |
64 $ hg amend |
62 $ hg amend |
65 2 new content-divergent changesets |
|
66 $ hg glog --hidden |
63 $ hg glog --hidden |
67 @ 6:9c1631e352d9 added d |
64 @ 6:9c1631e352d9 added d |
68 | () draft |
65 | () draft |
69 | * 5:e49523854bc8 added d |
66 | o 5:e49523854bc8 added d |
70 |/ () draft |
67 |/ () draft |
71 | x 4:c41c793e0ef1 added d |
68 | x 4:c41c793e0ef1 added d |
72 |/ () draft |
69 |/ () draft |
73 o 3:ca1b80f7960a added c |
70 o 3:ca1b80f7960a added c |
74 | () draft |
71 | () draft |
127 working directory is now at 9c1631e352d9 |
124 working directory is now at 9c1631e352d9 |
128 |
125 |
129 $ hg glog --hidden |
126 $ hg glog --hidden |
130 @ 6:9c1631e352d9 added d |
127 @ 6:9c1631e352d9 added d |
131 | () draft |
128 | () draft |
132 | * 5:e49523854bc8 added d |
129 | o 5:e49523854bc8 added d |
133 |/ () draft |
130 |/ () draft |
134 | x 4:c41c793e0ef1 added d |
131 | x 4:c41c793e0ef1 added d |
135 |/ () draft |
132 |/ () draft |
136 o 3:ca1b80f7960a added c |
133 o 3:ca1b80f7960a added c |
137 | () draft |
134 | () draft |
150 $ hg amend |
147 $ hg amend |
151 $ hg up .^ |
148 $ hg up .^ |
152 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
149 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
153 $ echo bar > c |
150 $ echo bar > c |
154 $ hg amend |
151 $ hg amend |
155 2 new orphan changesets |
|
156 $ hg up ca1b80f7960a --hidden |
152 $ hg up ca1b80f7960a --hidden |
157 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
153 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
158 working directory parent is obsolete! (ca1b80f7960a) |
154 working directory parent is obsolete! (ca1b80f7960a) |
159 (use 'hg evolve' to update to its successor: 2ba73e31f264) |
155 (use 'hg evolve' to update to its successor: 2ba73e31f264) |
160 $ echo foobar > c |
156 $ echo foobar > c |
161 $ hg amend |
157 $ hg amend |
162 2 new content-divergent changesets |
|
163 $ echo bar > c |
158 $ echo bar > c |
164 $ hg amend |
159 $ hg amend |
165 |
160 |
166 $ hg glog --hidden |
161 $ hg glog --hidden |
167 @ 10:491e10505bae added c |
162 @ 10:491e10505bae added c |
168 | () draft |
163 | () draft |
169 | x 9:7398f702a162 added c |
164 | x 9:7398f702a162 added c |
170 |/ () draft |
165 |/ () draft |
171 | * 8:2ba73e31f264 added c |
166 | o 8:2ba73e31f264 added c |
172 |/ () draft |
167 |/ () draft |
173 | * 7:f0f1694f123e added d |
168 | o 7:f0f1694f123e added d |
174 | | () draft |
169 | | () draft |
175 | | x 6:9c1631e352d9 added d |
170 | | x 6:9c1631e352d9 added d |
176 | |/ () draft |
171 | |/ () draft |
177 | | * 5:e49523854bc8 added d |
172 | | o 5:e49523854bc8 added d |
178 | |/ () draft |
173 | |/ () draft |
179 | | x 4:c41c793e0ef1 added d |
174 | | x 4:c41c793e0ef1 added d |
180 | |/ () draft |
175 | |/ () draft |
181 | x 3:ca1b80f7960a added c |
176 | x 3:ca1b80f7960a added c |
182 |/ () draft |
177 |/ () draft |
204 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
199 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
205 fix conflicts and see `hg help evolve.interrupted` |
200 fix conflicts and see `hg help evolve.interrupted` |
206 [1] |
201 [1] |
207 |
202 |
208 $ hg evolve --abort |
203 $ hg evolve --abort |
209 2 new content-divergent changesets |
|
210 evolve aborted |
204 evolve aborted |
211 working directory is now at 491e10505bae |
205 working directory is now at 491e10505bae |
212 |
206 |
213 $ hg glog --hidden |
207 $ hg glog --hidden |
214 @ 10:491e10505bae added c |
208 @ 10:491e10505bae added c |
215 | () draft |
209 | () draft |
216 | x 9:7398f702a162 added c |
210 | x 9:7398f702a162 added c |
217 |/ () draft |
211 |/ () draft |
218 | * 8:2ba73e31f264 added c |
212 | o 8:2ba73e31f264 added c |
219 |/ () draft |
213 |/ () draft |
220 | * 7:f0f1694f123e added d |
214 | o 7:f0f1694f123e added d |
221 | | () draft |
215 | | () draft |
222 | | x 6:9c1631e352d9 added d |
216 | | x 6:9c1631e352d9 added d |
223 | |/ () draft |
217 | |/ () draft |
224 | | * 5:e49523854bc8 added d |
218 | | o 5:e49523854bc8 added d |
225 | |/ () draft |
219 | |/ () draft |
226 | | x 4:c41c793e0ef1 added d |
220 | | x 4:c41c793e0ef1 added d |
227 | |/ () draft |
221 | |/ () draft |
228 | x 3:ca1b80f7960a added c |
222 | x 3:ca1b80f7960a added c |
229 |/ () draft |
223 |/ () draft |
233 | () draft |
227 | () draft |
234 o 0:8fa14d15e168 added hgignore |
228 o 0:8fa14d15e168 added hgignore |
235 () draft |
229 () draft |
236 |
230 |
237 $ hg obslog -r . --all |
231 $ hg obslog -r . --all |
238 * 2ba73e31f264 (8) added c |
232 o 2ba73e31f264 (8) added c |
239 | |
233 | |
240 | @ 491e10505bae (10) added c |
234 | @ 491e10505bae (10) added c |
241 | | |
235 | | |
242 | x 7398f702a162 (9) added c |
236 | x 7398f702a162 (9) added c |
243 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
237 |/ rewritten(content) as 491e10505bae using amend by test (Thu Jan 01 00:00:00 1970 +0000) |
276 $ echo bar > c |
270 $ echo bar > c |
277 $ hg add c |
271 $ hg add c |
278 $ hg amend |
272 $ hg amend |
279 |
273 |
280 $ hg up --hidden c41c793e0ef1 |
274 $ hg up --hidden c41c793e0ef1 |
281 updating to a hidden changeset c41c793e0ef1 |
|
282 (hidden revision 'c41c793e0ef1' was rewritten as: 69bdd23a9b0d) |
|
283 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
275 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
284 working directory parent is obsolete! (c41c793e0ef1) |
276 working directory parent is obsolete! (c41c793e0ef1) |
285 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
277 (use 'hg evolve' to update to its successor: 69bdd23a9b0d) |
286 $ echo bar > d |
278 $ echo bar > d |
287 $ hg amend |
279 $ hg amend |
288 2 new content-divergent changesets |
|
289 |
280 |
290 $ hg glog |
281 $ hg glog |
291 @ 7:e49523854bc8 added d |
282 @ 7:e49523854bc8 added d |
292 | () draft |
283 | () draft |
293 | * 6:69bdd23a9b0d added d |
284 | o 6:69bdd23a9b0d added d |
294 | | () draft |
285 | | () draft |
295 o | 3:ca1b80f7960a added c |
286 o | 3:ca1b80f7960a added c |
296 | | () draft |
287 | | () draft |
297 o | 2:b1661037fa25 added b |
288 o | 2:b1661037fa25 added b |
298 |/ () draft |
289 |/ () draft |
316 working directory is now at e49523854bc8 |
307 working directory is now at e49523854bc8 |
317 |
308 |
318 $ hg glog |
309 $ hg glog |
319 @ 7:e49523854bc8 added d |
310 @ 7:e49523854bc8 added d |
320 | () draft |
311 | () draft |
321 | * 6:69bdd23a9b0d added d |
312 | o 6:69bdd23a9b0d added d |
322 | | () draft |
313 | | () draft |
323 o | 3:ca1b80f7960a added c |
314 o | 3:ca1b80f7960a added c |
324 | | () draft |
315 | | () draft |
325 o | 2:b1661037fa25 added b |
316 o | 2:b1661037fa25 added b |
326 |/ () draft |
317 |/ () draft |
371 working directory is now at 33e4442acf98 |
362 working directory is now at 33e4442acf98 |
372 |
363 |
373 $ hg glog |
364 $ hg glog |
374 @ 8:33e4442acf98 added d |
365 @ 8:33e4442acf98 added d |
375 | () draft |
366 | () draft |
376 | * 7:e49523854bc8 added d |
367 | o 7:e49523854bc8 added d |
377 | | () draft |
368 | | () draft |
378 | o 3:ca1b80f7960a added c |
369 | o 3:ca1b80f7960a added c |
379 | | () draft |
370 | | () draft |
380 | o 2:b1661037fa25 added b |
371 | o 2:b1661037fa25 added b |
381 |/ () draft |
372 |/ () draft |
420 |
411 |
421 $ echo bar > d |
412 $ echo bar > d |
422 $ hg amend |
413 $ hg amend |
423 |
414 |
424 $ hg up c41c793e0ef1 --hidden |
415 $ hg up c41c793e0ef1 --hidden |
425 updating to a hidden changeset c41c793e0ef1 |
|
426 (hidden revision 'c41c793e0ef1' was rewritten as: e49523854bc8) |
|
427 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
416 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
428 working directory parent is obsolete! (c41c793e0ef1) |
417 working directory parent is obsolete! (c41c793e0ef1) |
429 (use 'hg evolve' to update to its successor: e49523854bc8) |
418 (use 'hg evolve' to update to its successor: e49523854bc8) |
430 |
419 |
431 $ echo foobar > d |
420 $ echo foobar > d |
432 $ hg amend |
421 $ hg amend |
433 2 new content-divergent changesets |
|
434 $ hg glog --hidden |
422 $ hg glog --hidden |
435 @ 6:9c1631e352d9 added d |
423 @ 6:9c1631e352d9 added d |
436 | () draft |
424 | () draft |
437 | * 5:e49523854bc8 added d |
425 | o 5:e49523854bc8 added d |
438 |/ () draft |
426 |/ () draft |
439 | x 4:c41c793e0ef1 added d |
427 | x 4:c41c793e0ef1 added d |
440 |/ () draft |
428 |/ () draft |
441 o 3:ca1b80f7960a added c |
429 o 3:ca1b80f7960a added c |
442 | () draft |
430 | () draft |
463 working directory is now at 9c1631e352d9 |
451 working directory is now at 9c1631e352d9 |
464 |
452 |
465 $ hg glog --hidden |
453 $ hg glog --hidden |
466 @ 6:9c1631e352d9 added d |
454 @ 6:9c1631e352d9 added d |
467 | () draft |
455 | () draft |
468 | * 5:e49523854bc8 added d |
456 | o 5:e49523854bc8 added d |
469 |/ () draft |
457 |/ () draft |
470 | x 4:c41c793e0ef1 added d |
458 | x 4:c41c793e0ef1 added d |
471 |/ () draft |
459 |/ () draft |
472 o 3:ca1b80f7960a added c |
460 o 3:ca1b80f7960a added c |
473 | () draft |
461 | () draft |
486 rebasing 6:9c1631e352d9 "added d" (tip) |
474 rebasing 6:9c1631e352d9 "added d" (tip) |
487 |
475 |
488 $ hg glog |
476 $ hg glog |
489 @ 7:517d4375cb72 added d |
477 @ 7:517d4375cb72 added d |
490 | () draft |
478 | () draft |
491 | * 5:e49523854bc8 added d |
479 | o 5:e49523854bc8 added d |
492 | | () draft |
480 | | () draft |
493 | o 3:ca1b80f7960a added c |
481 | o 3:ca1b80f7960a added c |
494 | | () draft |
482 | | () draft |
495 | o 2:b1661037fa25 added b |
483 | o 2:b1661037fa25 added b |
496 |/ () draft |
484 |/ () draft |
517 working directory is now at 517d4375cb72 |
505 working directory is now at 517d4375cb72 |
518 |
506 |
519 $ hg glog |
507 $ hg glog |
520 @ 7:517d4375cb72 added d |
508 @ 7:517d4375cb72 added d |
521 | () draft |
509 | () draft |
522 | * 5:e49523854bc8 added d |
510 | o 5:e49523854bc8 added d |
523 | | () draft |
511 | | () draft |
524 | o 3:ca1b80f7960a added c |
512 | o 3:ca1b80f7960a added c |
525 | | () draft |
513 | | () draft |
526 | o 2:b1661037fa25 added b |
514 | o 2:b1661037fa25 added b |
527 |/ () draft |
515 |/ () draft |
581 stopped the interrupted evolve |
569 stopped the interrupted evolve |
582 working directory is now at ca1b80f7960a |
570 working directory is now at ca1b80f7960a |
583 |
571 |
584 XXX: we should have preserved the wdir to be at rev 8 |
572 XXX: we should have preserved the wdir to be at rev 8 |
585 $ hg glog |
573 $ hg glog |
586 * 8:8fd1c4bd144c added d |
574 o 8:8fd1c4bd144c added d |
587 | () draft |
575 | () draft |
588 | * 5:e49523854bc8 added d |
576 | o 5:e49523854bc8 added d |
589 | | () draft |
577 | | () draft |
590 | @ 3:ca1b80f7960a added c |
578 | @ 3:ca1b80f7960a added c |
591 | | () draft |
579 | | () draft |
592 | o 2:b1661037fa25 added b |
580 | o 2:b1661037fa25 added b |
593 |/ () draft |
581 |/ () draft |