94 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
94 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
95 abort: Make changes as needed, you may commit or record as needed now. |
95 abort: Make changes as needed, you may commit or record as needed now. |
96 When you are finished, run hg histedit --continue to resume. |
96 When you are finished, run hg histedit --continue to resume. |
97 $ continueediting true "(leaving commit message unaltered)" |
97 $ continueediting true "(leaving commit message unaltered)" |
98 % finalize changeset editing (leaving commit message unaltered) |
98 % finalize changeset editing (leaving commit message unaltered) |
99 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
99 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
100 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 |
100 |
102 |
101 check state of working copy |
103 check state of working copy |
102 $ hg id |
104 $ hg id |
103 652413bf663e tip |
105 794fe033d0a0 tip |
104 |
106 |
105 $ graphlog "log after history editing" |
107 $ graphlog "log after history editing" |
106 % log after history editing |
108 % log after history editing |
107 @ 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" |
109 @ 5 794fe033d0a030f8df77c5de945fca35c9181c30 "f" |
108 | |
110 | |
109 o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" |
111 o 4 04d2fab980779f332dec458cc944f28de8b43435 "e" |
110 | |
112 | |
111 o 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" |
113 o 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" |
112 | |
114 | |
113 o 2 177f92b773850b59254aa5e923436f921b55483b "c" |
115 o 2 177f92b773850b59254aa5e923436f921b55483b "c" |
114 | |
116 | |
150 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
152 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
151 abort: Make changes as needed, you may commit or record as needed now. |
153 abort: Make changes as needed, you may commit or record as needed now. |
152 When you are finished, run hg histedit --continue to resume. |
154 When you are finished, run hg histedit --continue to resume. |
153 $ graphlog "log after first edit" |
155 $ graphlog "log after first edit" |
154 % log after first edit |
156 % log after first edit |
155 o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" |
157 @ 6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d" |
156 | |
158 | |
157 o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" |
159 | o 5 652413bf663ef2a641cab26574e46d5f5a64a55a "f" |
158 | |
160 | | |
159 @ 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" |
161 | o 4 e860deea161a2f77de56603b340ebbb4536308ae "e" |
160 | |
162 | | |
|
163 | o 3 055a42cdd88768532f9cf79daa407fc8d138de9b "d" |
|
164 |/ |
161 o 2 177f92b773850b59254aa5e923436f921b55483b "c" |
165 o 2 177f92b773850b59254aa5e923436f921b55483b "c" |
162 | |
166 | |
163 o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b" |
167 o 1 d2ae7f538514cd87c17547b0de4cea71fe1af9fb "b" |
164 | |
168 | |
165 o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" |
169 o 0 cb9a9f314b8b07ba71012fcdbc544b5a4d82ff5b "a" |