Mercurial > evolve
view tests/test-check-setup-manifest.t @ 3757:2bc60fcac354
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 | 39d84b395343 |
children | f2139537c2be |
line wrap: on
line source
#require test-repo $ checkcm() { > if ! (which check-manifest > /dev/null); then > echo skipped: missing tool: check-manifest; > exit 80; > fi; > }; $ checkcm $ cat << EOF >> $HGRCPATH > [experimental] > evolution=all > EOF Run check manifest: $ cd $TESTDIR/.. $ check-manifest lists of files in version control and sdist match