Mercurial > evolve
view tests/test-check-flake8.t @ 4483:7978230faa32 stable
evolve: make sure div resolution don't replace the initial author (issue6113)
Before this patch, divergence resolution logic taking the current user who
is running the resolution command as the author of commit that will
be created after merging the two divergent csets.
This patch make sure that we preserve the initial author.
Changes in test file reflect the fixed behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Wed, 10 Apr 2019 15:37:29 +0200 |
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