tests/test-histedit-no-change.out
changeset 17085 35729bdd59b6
parent 17084 69dae7982c85
child 17086 5f2cacb715dc
equal deleted inserted replaced
17084:69dae7982c85 17085:35729bdd59b6
     1 % test editing with no change
       
     2 -----------------------------
       
     3 % log before editing
       
     4 @  5 652413bf663ef2a641cab26574e46d5f5a64a55a "f"
       
     5 |
       
     6 o  4 e860deea161a2f77de56603b340ebbb4536308ae "e"
       
     7 |
       
     8 o  3 055a42cdd88768532f9cf79daa407fc8d138de9b "d"
       
     9 |
       
    10 o  2 177f92b773850b59254aa5e923436f921b55483b "c"
       
    11 |
       
    12 o  1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b"
       
    13 |
       
    14 o  0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
       
    15 
       
    16 % start editing the history (not changing anything)
       
    17 | pick 055a42cdd887 3 d
       
    18 | edit e860deea161a 4 e
       
    19 | pick 652413bf663e 5 f
       
    20 0 files updated, 0 files merged, 2 files removed, 0 files unresolved
       
    21 abort: Make changes as needed, you may commit or record as needed now.
       
    22 When you are finished, run hg histedit --continue to resume.
       
    23 % finalize changeset editing (leaving commit message unaltered)
       
    24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    25 % check state of working copy
       
    26 652413bf663e tip
       
    27 % log after history editing
       
    28 @  5 652413bf663ef2a641cab26574e46d5f5a64a55a "f"
       
    29 |
       
    30 o  4 e860deea161a2f77de56603b340ebbb4536308ae "e"
       
    31 |
       
    32 o  3 055a42cdd88768532f9cf79daa407fc8d138de9b "d"
       
    33 |
       
    34 o  2 177f92b773850b59254aa5e923436f921b55483b "c"
       
    35 |
       
    36 o  1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b"
       
    37 |
       
    38 o  0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
       
    39 
       
    40 % test editing with no change, then abort
       
    41 -----------------------------------------
       
    42 % log before editing
       
    43 @  5 652413bf663ef2a641cab26574e46d5f5a64a55a "f"
       
    44 |
       
    45 o  4 e860deea161a2f77de56603b340ebbb4536308ae "e"
       
    46 |
       
    47 o  3 055a42cdd88768532f9cf79daa407fc8d138de9b "d"
       
    48 |
       
    49 o  2 177f92b773850b59254aa5e923436f921b55483b "c"
       
    50 |
       
    51 o  1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b"
       
    52 |
       
    53 o  0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
       
    54 
       
    55 % start editing the history (not changing anything)
       
    56 | edit 055a42cdd887 3 d
       
    57 | edit e860deea161a 4 e
       
    58 | pick 652413bf663e 5 f
       
    59 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
       
    60 abort: Make changes as needed, you may commit or record as needed now.
       
    61 When you are finished, run hg histedit --continue to resume.
       
    62 % finalize changeset editing (leaving commit message unaltered)
       
    63 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    64 abort: Make changes as needed, you may commit or record as needed now.
       
    65 When you are finished, run hg histedit --continue to resume.
       
    66 % log after first edit
       
    67 o  5 652413bf663ef2a641cab26574e46d5f5a64a55a "f"
       
    68 |
       
    69 o  4 e860deea161a2f77de56603b340ebbb4536308ae "e"
       
    70 |
       
    71 @  3 055a42cdd88768532f9cf79daa407fc8d138de9b "d"
       
    72 |
       
    73 o  2 177f92b773850b59254aa5e923436f921b55483b "c"
       
    74 |
       
    75 o  1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b"
       
    76 |
       
    77 o  0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
       
    78 
       
    79 % abort editing session
       
    80 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
       
    81 % log after abort
       
    82 @  5 652413bf663ef2a641cab26574e46d5f5a64a55a "f"
       
    83 |
       
    84 o  4 e860deea161a2f77de56603b340ebbb4536308ae "e"
       
    85 |
       
    86 o  3 055a42cdd88768532f9cf79daa407fc8d138de9b "d"
       
    87 |
       
    88 o  2 177f92b773850b59254aa5e923436f921b55483b "c"
       
    89 |
       
    90 o  1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b"
       
    91 |
       
    92 o  0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a"
       
    93 
       
    94 % EOF