Mercurial > evolve
view tests/test-check-setup-manifest.t @ 4990:f3fd3c1c3da0 stable
evolve: add test to demonstrate issue6203
Current logic of content-divergence resolution contains a bug that
if resolution parent is not the parent of any of the two divergent
changesets, it could undo some changes.
I think a good solution for this is to first relocate the divergent cset
to it's obsolete parent's successor if applicable and then perform
the content-divergence resolution.
Next patch will fix the issue.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 23 Nov 2019 20:25:16 +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