Mercurial > evolve
comparison tests/test-evolve-continue.t @ 3493:4544067b831b
evolve: make `hg evolve --continue` respect `--confirm`
Previous patch added capability to `hg evolve --continue` to continue the rest
of the stack, not just the current revision but that was missing respecting the
`--confirm` flag which user passed earlier. This patch makes sure we respect the
`--confirm` flag.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Sun, 28 Jan 2018 23:49:46 +0530 |
| parents | 53cd61f7f9c9 |
| children | 14cd04ff968e |
comparison
equal
deleted
inserted
replaced
| 3492:53cd61f7f9c9 | 3493:4544067b831b |
|---|---|
| 318 (no more unresolved files) | 318 (no more unresolved files) |
| 319 continue: hg evolve --continue | 319 continue: hg evolve --continue |
| 320 | 320 |
| 321 XXX: this should have asked for confirmation | 321 XXX: this should have asked for confirmation |
| 322 | 322 |
| 323 $ hg evolve --continue | 323 $ hg evolve --continue<<EOF |
| 324 > y | |
| 325 > EOF | |
| 324 evolving 19:981e615b14ca "added g" | 326 evolving 19:981e615b14ca "added g" |
| 325 move:[20] added h | 327 move:[20] added h |
| 326 atop:[22] added g | 328 atop:[22] added g |
| 329 perform evolve? [Ny] y | |
| 327 | 330 |
| 328 $ hg glog | 331 $ hg glog |
| 329 @ 23:af6bd002a48d added h | 332 @ 23:af6bd002a48d added h |
| 330 | () draft | 333 | () draft |
| 331 o 22:d2c94a8f44bd added g | 334 o 22:d2c94a8f44bd added g |