Mercurial > evolve
comparison tests/test-fixup.t @ 6196:4a837da84f5f
fixup: allow to be aborted using hg abort
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Sun, 06 Mar 2022 17:44:11 +0300 |
| parents | 9e0aa8929206 |
| children | d18e16b9b793 |
comparison
equal
deleted
inserted
replaced
| 6195:9e0aa8929206 | 6196:4a837da84f5f |
|---|---|
| 185 --- a/foo | 185 --- a/foo |
| 186 +++ b/foo | 186 +++ b/foo |
| 187 @@ -1,1 +1,2 @@ | 187 @@ -1,1 +1,2 @@ |
| 188 foo | 188 foo |
| 189 +update foo again | 189 +update foo again |
| 190 | |
| 191 testing abort command | |
| 192 | |
| 193 $ hg fixup -r 'desc("update foo")' | |
| 194 merging foo | |
| 195 warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') | |
| 196 unresolved merge conflicts | |
| 197 (see 'hg help evolve.interrupted') | |
| 198 [240] | |
| 199 | |
| 200 $ hg abort | |
| 201 fixup aborted | |
| 202 working directory is now at 12b5e442244f | |
| 190 | 203 |
| 191 testing --continue flag | 204 testing --continue flag |
| 192 | 205 |
| 193 $ hg fixup -r 'desc("update foo")' | 206 $ hg fixup -r 'desc("update foo")' |
| 194 merging foo | 207 merging foo |