Mercurial > evolve

comparison tests/test-evolve-stop-contentdiv.t @ 3827:82c72eb37f85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: strip the relocation commit on `hg evolve --stop` While resolving content-divergence on multiple parents, we relocate one of the commit on the parent of another one and then merge the divergent changesets. Merging can leads to conflicts, and if user does `hg evolve --stop`, we need to strip that relocated changeset too! This patch does that. Test changes demonstrates the fix.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 00:47:28 +0530
parents 7b33a6ed0539
children c58ebf5d2f57
comparison
equal deleted inserted replaced
3826:8e8bd5bb2f90 3827:82c72eb37f85
132 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort 132 abort: fix conflicts and run 'hg evolve --continue' or use 'hg update -C .' to abort
133 [255] 133 [255]
134 134
135 $ hg evolve --stop 135 $ hg evolve --stop
136 stopped the interrupted evolve 136 stopped the interrupted evolve
137 working directory is now at e49523854bc8 137 working directory is now at 517d4375cb72
138 138
139 XXX: we need to strip the relocated commit
140 $ hg glog 139 $ hg glog
141 * 8:606ad96040fc added d 140 @ 7:517d4375cb72 added d
142 | () draft 141 | () draft
143 | @ 5:e49523854bc8 added d 142 | * 5:e49523854bc8 added d
143 | | () draft
144 | o 3:ca1b80f7960a added c
145 | | () draft
146 | o 2:b1661037fa25 added b
144 |/ () draft 147 |/ () draft
145 o 3:ca1b80f7960a added c
146 | () draft
147 o 2:b1661037fa25 added b
148 | () draft
149 o 1:c7586e2a9264 added a 148 o 1:c7586e2a9264 added a
150 | () draft 149 | () draft
151 o 0:8fa14d15e168 added hgignore 150 o 0:8fa14d15e168 added hgignore
152 () draft 151 () draft