Mercurial > evolve

comparison tests/test-evolve-abort-phasediv.t @ 3757:2bc60fcac354

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: make `--abort` strip the temporary revs created during resolution During divergence resolution, `hg evolve` created temporary relocation commits which needs to be stripped off during `hg evolve --abort` to get back to the same state where we were. Previous patch added a new list temprevs to be stored in evolvestate. This patch starts storing the temp relocated node created during phase-divergence resolution in evolvestate and make sure we consider stripping it too while `hg evolve --abort`. The test changes demonstrate the fix. Now we are sucessfully aborting a phase-divergence resolution.
author Pulkit Goyal <7895pulkit@gmail.com>
date Wed, 23 May 2018 02:46:20 +0530
parents a19703c6d2bb
children 1f339d81aabd
comparison
equal deleted inserted replaced
3756:26b9b89f8dac 3757:2bc60fcac354
187 fix conflict then run 'hg evolve --continue' or use `hg evolve --abort` 187 fix conflict then run 'hg evolve --continue' or use `hg evolve --abort`
188 abort: unresolved merge conflicts (see hg help resolve) 188 abort: unresolved merge conflicts (see hg help resolve)
189 [255] 189 [255]
190 190
191 $ hg evolve --abort 191 $ hg evolve --abort
192 1 new phase-divergent changesets
192 evolve aborted 193 evolve aborted
193 working directory is now at 28cd06b3f801 194 working directory is now at 28cd06b3f801
194 195
195 $ hg glog --hidden 196 $ hg glog --hidden
196 x 10:b7aedbe61ce6 added d 197 @ 9:28cd06b3f801 added c
197 | () draft 198 | () draft
198 | @ 9:28cd06b3f801 added c 199 | x 8:9ff8adbe8a24 added c
199 | | () draft 200 |/ () draft
200 | | x 8:9ff8adbe8a24 added c 201 | * 7:e44ebefe4f54 added d
201 | |/ () draft 202 |/ () draft
202 | | x 7:e44ebefe4f54 added d 203 | x 6:ddba58020bc0 added d
203 | |/ () draft 204 |/ () draft
204 | | x 6:ddba58020bc0 added d 205 | x 5:cfe30edc6125 added d
205 | |/ () draft 206 |/ () draft
206 | | x 5:cfe30edc6125 added d 207 | o 4:c41c793e0ef1 added d
207 | |/ () draft 208 | | () public
208 +---o 4:c41c793e0ef1 added d 209 | o 3:ca1b80f7960a added c
209 | | () public 210 | | () public
210 o | 3:ca1b80f7960a added c 211 | o 2:b1661037fa25 added b
211 | | () public 212 |/ () public
212 o | 2:b1661037fa25 added b 213 o 1:c7586e2a9264 added a
213 |/ () public 214 | () public
214 o 1:c7586e2a9264 added a 215 o 0:8fa14d15e168 added hgignore
215 | () public 216 () public
216 o 0:8fa14d15e168 added hgignore
217 () public