tests/test-histedit-no-change.t
changeset 27629 e7ff83b2bcfe
parent 27407 bf4d5d8dc2aa
child 45840 527ce85c2e60
equal deleted inserted replaced
27628:707d66afce21 27629:e7ff83b2bcfe
    89   % start editing the history (not changing anything)
    89   % start editing the history (not changing anything)
    90   | pick 055a42cdd887 3 d
    90   | pick 055a42cdd887 3 d
    91   | edit e860deea161a 4 e
    91   | edit e860deea161a 4 e
    92   | pick 652413bf663e 5 f
    92   | pick 652413bf663e 5 f
    93   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
    93   0 files updated, 0 files merged, 2 files removed, 0 files unresolved
    94   Make changes as needed, you may commit or record as needed now.
    94   Editing (e860deea161a), you may commit or record as needed now.
    95   When you are finished, run hg histedit --continue to resume.
    95   (hg histedit --continue to resume)
    96   $ continueediting true "(leaving commit message unaltered)"
    96   $ continueediting true "(leaving commit message unaltered)"
    97   % finalize changeset editing (leaving commit message unaltered)
    97   % finalize changeset editing (leaving commit message unaltered)
    98 
    98 
    99 
    99 
   100 check state of working copy
   100 check state of working copy
   140   % start editing the history (not changing anything)
   140   % start editing the history (not changing anything)
   141   | edit 055a42cdd887 3 d
   141   | edit 055a42cdd887 3 d
   142   | edit e860deea161a 4 e
   142   | edit e860deea161a 4 e
   143   | pick 652413bf663e 5 f
   143   | pick 652413bf663e 5 f
   144   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   144   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
   145   Make changes as needed, you may commit or record as needed now.
   145   Editing (055a42cdd887), you may commit or record as needed now.
   146   When you are finished, run hg histedit --continue to resume.
   146   (hg histedit --continue to resume)
   147   $ continueediting true "(leaving commit message unaltered)"
   147   $ continueediting true "(leaving commit message unaltered)"
   148   % finalize changeset editing (leaving commit message unaltered)
   148   % finalize changeset editing (leaving commit message unaltered)
   149   Make changes as needed, you may commit or record as needed now.
   149   Editing (e860deea161a), you may commit or record as needed now.
   150   When you are finished, run hg histedit --continue to resume.
   150   (hg histedit --continue to resume)
   151   $ graphlog "log after first edit"
   151   $ graphlog "log after first edit"
   152   % log after first edit
   152   % log after first edit
   153   @  6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d"
   153   @  6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d"
   154   |
   154   |
   155   | o  5 652413bf663ef2a641cab26574e46d5f5a64a55a "f"
   155   | o  5 652413bf663ef2a641cab26574e46d5f5a64a55a "f"
   209   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   209   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   210   $ hg commit --close-branch -m 'closebranch'
   210   $ hg commit --close-branch -m 'closebranch'
   211   $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
   211   $ startediting 1 1 "(not changing anything)" # edit the 3rd of 3 changesets
   212   % start editing the history (not changing anything)
   212   % start editing the history (not changing anything)
   213   | edit 292aec348d9e 6 closebranch
   213   | edit 292aec348d9e 6 closebranch
   214   Make changes as needed, you may commit or record as needed now.
   214   Editing (292aec348d9e), you may commit or record as needed now.
   215   When you are finished, run hg histedit --continue to resume.
   215   (hg histedit --continue to resume)
   216   $ hg histedit --abort
   216   $ hg histedit --abort
   217 
   217 
   218   $ cd ..
   218   $ cd ..