Mercurial > evolve
comparison tests/test-pick.t @ 6128:10ccdee05ec0
pick: show abort message after pick is aborted for consistency
Other commands, like evolve, rebase and graft, show such a message after
they've already been aborted, and this is also an opportunity to use the common
"working directory is now at" message.
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Fri, 11 Feb 2022 18:55:02 +0300 |
| parents | 0d8d805fadbb |
| children | ceab1399302c |
comparison
equal
deleted
inserted
replaced
| 6127:4ac6ca50bb2e | 6128:10ccdee05ec0 |
|---|---|
| 267 #if abortcommand | 267 #if abortcommand |
| 268 $ hg abort --dry-run | 268 $ hg abort --dry-run |
| 269 pick in progress, will be aborted | 269 pick in progress, will be aborted |
| 270 #endif | 270 #endif |
| 271 $ hg abort | 271 $ hg abort |
| 272 aborting pick, updating to c437988de89f | 272 pick aborted |
| 273 working directory is now at c437988de89f | |
| 273 | 274 |
| 274 $ hg glog | 275 $ hg glog |
| 275 @ 10:c437988de89f foo to b | 276 @ 10:c437988de89f foo to b |
| 276 | | 277 | |
| 277 o 8:44e155eb95c7 add c | 278 o 8:44e155eb95c7 add c |