Mercurial > hg-stable
comparison tests/test-histedit-no-change.t @ 18934:93f3a06b2035
histedit: switch from util.Abort to util.InterventionRequired where appropriate (bc)
| author | Augie Fackler <raf@durin42.com> |
|---|---|
| date | Fri, 08 Feb 2013 16:27:49 -0600 |
| parents | 358c23e8f1c6 |
| children | c2a479a058d0 |
comparison
equal
deleted
inserted
replaced
| 18933:42b620fc89e2 | 18934:93f3a06b2035 |
|---|---|
| 90 % start editing the history (not changing anything) | 90 % start editing the history (not changing anything) |
| 91 | pick 055a42cdd887 3 d | 91 | pick 055a42cdd887 3 d |
| 92 | edit e860deea161a 4 e | 92 | edit e860deea161a 4 e |
| 93 | pick 652413bf663e 5 f | 93 | pick 652413bf663e 5 f |
| 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 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 0 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 | 100 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 143 % start editing the history (not changing anything) | 143 % start editing the history (not changing anything) |
| 144 | edit 055a42cdd887 3 d | 144 | edit 055a42cdd887 3 d |
| 145 | edit e860deea161a 4 e | 145 | edit e860deea161a 4 e |
| 146 | pick 652413bf663e 5 f | 146 | pick 652413bf663e 5 f |
| 147 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 147 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 148 abort: Make changes as needed, you may commit or record as needed now. | 148 Make changes as needed, you may commit or record as needed now. |
| 149 When you are finished, run hg histedit --continue to resume. | 149 When you are finished, run hg histedit --continue to resume. |
| 150 $ continueediting true "(leaving commit message unaltered)" | 150 $ continueediting true "(leaving commit message unaltered)" |
| 151 % finalize changeset editing (leaving commit message unaltered) | 151 % finalize changeset editing (leaving commit message unaltered) |
| 152 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 |
| 153 abort: Make changes as needed, you may commit or record as needed now. | 153 Make changes as needed, you may commit or record as needed now. |
| 154 When you are finished, run hg histedit --continue to resume. | 154 When you are finished, run hg histedit --continue to resume. |
| 155 $ graphlog "log after first edit" | 155 $ graphlog "log after first edit" |
| 156 % log after first edit | 156 % log after first edit |
| 157 @ 6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d" | 157 @ 6 e5ae3ca2f1ffdbd89ec41ebc273a231f7c3022f2 "d" |
| 158 | | 158 | |