Mercurial > evolve
view tests/test-check-flake8.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 | b3dbba6e34c9 |
children | f354de498737 |
line wrap: on
line source
#require test-repo $ checkflake8() { > if ! (which flake8 > /dev/null); then > echo skipped: missing tool: flake8; > exit 80; > fi; > }; $ checkflake8 Copied from Mercurial core (60ee2593a270) $ cd "`dirname "$TESTDIR"`" run flake8 if it exists; if it doesn't, then just skip $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' \ > -X hgext3rd/evolve/thirdparty \ > 2>/dev/null \ > | xargs -0 flake8