equal
deleted
inserted
replaced
134 $ hg histedit -r '.' --commands - <<EOF |
134 $ hg histedit -r '.' --commands - <<EOF |
135 > edit b346ab9a313d 6 c |
135 > edit b346ab9a313d 6 c |
136 > EOF |
136 > EOF |
137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
137 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
138 adding c |
138 adding c |
139 Make changes as needed, you may commit or record as needed now. |
139 Editing (b346ab9a313d), you may commit or record as needed now. |
140 When you are finished, run hg histedit --continue to resume. |
140 (hg histedit --continue to resume) |
141 [1] |
141 [1] |
142 $ echo c >> c |
142 $ echo c >> c |
143 $ hg histedit --continue |
143 $ hg histedit --continue |
144 |
144 |
145 $ hg log -r 'unstable()' |
145 $ hg log -r 'unstable()' |
278 > pick c62e7241a4f2 15 j |
278 > pick c62e7241a4f2 15 j |
279 > pick 14bda137d5b3 16 k |
279 > pick 14bda137d5b3 16 k |
280 > EOF |
280 > EOF |
281 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
281 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
282 adding f |
282 adding f |
283 Make changes as needed, you may commit or record as needed now. |
283 Editing (947ece25170f), you may commit or record as needed now. |
284 When you are finished, run hg histedit --continue to resume. |
284 (hg histedit --continue to resume) |
285 [1] |
285 [1] |
286 $ echo f >> f |
286 $ echo f >> f |
287 $ hg histedit --continue |
287 $ hg histedit --continue |
288 $ hg log -G |
288 $ hg log -G |
289 @ 24:12925f763c90 (secret) k |
289 @ 24:12925f763c90 (secret) k |
321 > pick c62e7241a4f2 15 j |
321 > pick c62e7241a4f2 15 j |
322 > pick 14bda137d5b3 16 k |
322 > pick 14bda137d5b3 16 k |
323 > EOF |
323 > EOF |
324 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
324 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
325 adding f |
325 adding f |
326 Make changes as needed, you may commit or record as needed now. |
326 Editing (947ece25170f), you may commit or record as needed now. |
327 When you are finished, run hg histedit --continue to resume. |
327 (hg histedit --continue to resume) |
328 [1] |
328 [1] |
329 $ echo f >> f |
329 $ echo f >> f |
330 $ hg histedit --continue |
330 $ hg histedit --continue |
331 $ hg log -G |
331 $ hg log -G |
332 @ 24:12925f763c90 (secret) k |
332 @ 24:12925f763c90 (secret) k |