Mercurial > hg
comparison tests/test-histedit-obsolete.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 | 21daee53c101 |
| children | e5d9441ec281 |
comparison
equal
deleted
inserted
replaced
| 18933:42b620fc89e2 | 18934:93f3a06b2035 |
|---|---|
| 137 > edit b346ab9a313d 6 c | 137 > edit b346ab9a313d 6 c |
| 138 > EOF | 138 > EOF |
| 139 $ hg histedit -r '.' --commands commands.txt | 139 $ hg histedit -r '.' --commands commands.txt |
| 140 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 140 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 141 adding c | 141 adding c |
| 142 abort: Make changes as needed, you may commit or record as needed now. | 142 Make changes as needed, you may commit or record as needed now. |
| 143 When you are finished, run hg histedit --continue to resume. | 143 When you are finished, run hg histedit --continue to resume. |
| 144 [255] | 144 [255] |
| 145 $ echo c >> c | 145 $ echo c >> c |
| 146 $ hg histedit --continue | 146 $ hg histedit --continue |
| 147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 147 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 276 > pick ee118ab9fa44 16 k | 276 > pick ee118ab9fa44 16 k |
| 277 > EOF | 277 > EOF |
| 278 $ hg histedit -r 'b449568bf7fc' --commands commands.txt | 278 $ hg histedit -r 'b449568bf7fc' --commands commands.txt |
| 279 0 files updated, 0 files merged, 6 files removed, 0 files unresolved | 279 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
| 280 adding f | 280 adding f |
| 281 abort: Make changes as needed, you may commit or record as needed now. | 281 Make changes as needed, you may commit or record as needed now. |
| 282 When you are finished, run hg histedit --continue to resume. | 282 When you are finished, run hg histedit --continue to resume. |
| 283 [255] | 283 [255] |
| 284 $ echo f >> f | 284 $ echo f >> f |
| 285 $ hg histedit --continue | 285 $ hg histedit --continue |
| 286 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 286 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 326 > pick ee118ab9fa44 16 k | 326 > pick ee118ab9fa44 16 k |
| 327 > EOF | 327 > EOF |
| 328 $ hg histedit -r 'b449568bf7fc' --commands commands.txt | 328 $ hg histedit -r 'b449568bf7fc' --commands commands.txt |
| 329 0 files updated, 0 files merged, 6 files removed, 0 files unresolved | 329 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
| 330 adding f | 330 adding f |
| 331 abort: Make changes as needed, you may commit or record as needed now. | 331 Make changes as needed, you may commit or record as needed now. |
| 332 When you are finished, run hg histedit --continue to resume. | 332 When you are finished, run hg histedit --continue to resume. |
| 333 [255] | 333 [255] |
| 334 $ echo f >> f | 334 $ echo f >> f |
| 335 $ hg histedit --continue | 335 $ hg histedit --continue |
| 336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 336 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |