[refactor-contentdiv1] make sure that --abort and --stop works when relocation of "divergent" in play while resolving content-divergence
- Nov 28, 2019
-
-
Sushil Khanchi authored
Changes in test file reflect the added behaviour. The intermediate changeset has been properly cleaned up by the `hg evolve --stop` call.
-
Sushil Khanchi authored
Right now, --stop leave the intermediate changeset (relocating the divergent changeset to its new location behind). This this is an incomplete step it should be removed by `hg --stop`.
109889c7d02d
-
- Nov 27, 2019
-
-
Sushil Khanchi authored
When resolving content-divergence where relocation of "divergent" changeset is also required, this test file make sure that --abort option is working fine.
08be8a4d5196
-