equal
deleted
inserted
replaced
41 adding d |
41 adding d |
42 $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan |
42 $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan |
43 $ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan |
43 $ echo "pick `hg log -r 2 -T '{node|short}'`" >> plan |
44 $ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan |
44 $ echo "edit `hg log -r 1 -T '{node|short}'`" >> plan |
45 $ hg histedit -r 'all()' --commands plan |
45 $ hg histedit -r 'all()' --commands plan |
46 Editing (1b2d564fad96), you may commit or record as needed now. |
46 Editing (1b2d564fad96), commit as needed now to split the change |
47 (hg histedit --continue to resume) |
47 (to edit 1b2d564fad96, `hg histedit --continue` after making changes) |
48 [240] |
48 [240] |
49 $ hg st |
49 $ hg st |
50 A b |
50 A b |
51 A c |
51 A c |
52 ? plan |
52 ? plan |
68 |
68 |
69 $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan |
69 $ echo "pick `hg log -r 0 -T '{node|short}'`" > plan |
70 $ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan |
70 $ echo "pick `hg log -r 5 -T '{node|short}'`" >> plan |
71 $ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan |
71 $ echo "edit `hg log -r 4 -T '{node|short}'`" >> plan |
72 $ hg histedit -r 'all()' --commands plan |
72 $ hg histedit -r 'all()' --commands plan |
73 Editing (49d44ab2be1b), you may commit or record as needed now. |
73 Editing (49d44ab2be1b), commit as needed now to split the change |
74 (hg histedit --continue to resume) |
74 (to edit 49d44ab2be1b, `hg histedit --continue` after making changes) |
75 [240] |
75 [240] |
76 $ hg st |
76 $ hg st |
77 A b |
77 A b |
78 A d |
78 A d |
79 ? plan |
79 ? plan |
223 11:c13eb81022ca f (no-eol) |
223 11:c13eb81022ca f (no-eol) |
224 $ hg histedit -r '.' --commands - <<EOF |
224 $ hg histedit -r '.' --commands - <<EOF |
225 > edit b346ab9a313d 6 c |
225 > edit b346ab9a313d 6 c |
226 > EOF |
226 > EOF |
227 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
227 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
228 Editing (b346ab9a313d), you may commit or record as needed now. |
228 Editing (b346ab9a313d), commit as needed now to split the change |
229 (hg histedit --continue to resume) |
229 (to edit b346ab9a313d, `hg histedit --continue` after making changes) |
230 [240] |
230 [240] |
231 $ echo c >> c |
231 $ echo c >> c |
232 $ hg histedit --continue |
232 $ hg histedit --continue |
233 1 new orphan changesets |
233 1 new orphan changesets |
234 |
234 |
357 > pick b605fb7503f2 14 i |
357 > pick b605fb7503f2 14 i |
358 > pick 3a6c53ee7f3d 15 j |
358 > pick 3a6c53ee7f3d 15 j |
359 > pick ee118ab9fa44 16 k |
359 > pick ee118ab9fa44 16 k |
360 > EOF |
360 > EOF |
361 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
361 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
362 Editing (b449568bf7fc), you may commit or record as needed now. |
362 Editing (b449568bf7fc), commit as needed now to split the change |
363 (hg histedit --continue to resume) |
363 (to edit b449568bf7fc, `hg histedit --continue` after making changes) |
364 [240] |
364 [240] |
365 $ echo f >> f |
365 $ echo f >> f |
366 $ hg histedit --continue |
366 $ hg histedit --continue |
367 $ hg log -G |
367 $ hg log -G |
368 @ 24:12e89af74238 (secret) k |
368 @ 24:12e89af74238 (secret) k |
399 > pick b605fb7503f2 14 i |
399 > pick b605fb7503f2 14 i |
400 > pick 3a6c53ee7f3d 15 j |
400 > pick 3a6c53ee7f3d 15 j |
401 > pick ee118ab9fa44 16 k |
401 > pick ee118ab9fa44 16 k |
402 > EOF |
402 > EOF |
403 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
403 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
404 Editing (b449568bf7fc), you may commit or record as needed now. |
404 Editing (b449568bf7fc), commit as needed now to split the change |
405 (hg histedit --continue to resume) |
405 (to edit b449568bf7fc, `hg histedit --continue` after making changes) |
406 [240] |
406 [240] |
407 $ echo f >> f |
407 $ echo f >> f |
408 $ hg histedit --continue |
408 $ hg histedit --continue |
409 $ hg log -G |
409 $ hg log -G |
410 @ 24:12e89af74238 (secret) k |
410 @ 24:12e89af74238 (secret) k |
525 > pick 6b70183d2492 14 g |
525 > pick 6b70183d2492 14 g |
526 > pick b605fb7503f2 16 i |
526 > pick b605fb7503f2 16 i |
527 > roll 3a6c53ee7f3d 17 j |
527 > roll 3a6c53ee7f3d 17 j |
528 > edit ee118ab9fa44 18 k |
528 > edit ee118ab9fa44 18 k |
529 > EOF |
529 > EOF |
530 Editing (ee118ab9fa44), you may commit or record as needed now. |
530 Editing (ee118ab9fa44), commit as needed now to split the change |
531 (hg histedit --continue to resume) |
531 (to edit ee118ab9fa44, `hg histedit --continue` after making changes) |
532 [240] |
532 [240] |
533 |
533 |
534 #if abortcommand |
534 #if abortcommand |
535 when in dry-run mode |
535 when in dry-run mode |
536 $ hg abort --dry-run |
536 $ hg abort --dry-run |
564 > pick 6b70183d2492 14 g |
564 > pick 6b70183d2492 14 g |
565 > pick b605fb7503f2 16 i |
565 > pick b605fb7503f2 16 i |
566 > pick 3a6c53ee7f3d 17 j |
566 > pick 3a6c53ee7f3d 17 j |
567 > edit ee118ab9fa44 18 k |
567 > edit ee118ab9fa44 18 k |
568 > EOF |
568 > EOF |
569 Editing (ee118ab9fa44), you may commit or record as needed now. |
569 Editing (ee118ab9fa44), commit as needed now to split the change |
570 (hg histedit --continue to resume) |
570 (to edit ee118ab9fa44, `hg histedit --continue` after making changes) |
571 [240] |
571 [240] |
572 $ hg histedit --continue --config experimental.evolution.track-operation=1 |
572 $ hg histedit --continue --config experimental.evolution.track-operation=1 |
573 $ hg log -G |
573 $ hg log -G |
574 @ 23:175d6b286a22 (secret) k |
574 @ 23:175d6b286a22 (secret) k |
575 | |
575 | |