view tests/test-check-flake8.t @ 5787:32c0b2899fc4

divergence-resolution: [patch 2] fix a messed up test case

Because of logic change in divergence resolution which causes the order change
in picking the resolution parent this test case was messed up.

It was supposed to test that that it hits conflict while relocating the
divergent cset but because of some change in previous patches, relocation went
successful and it hits conflict while merging the two divergent csets.

This patch, by making some changes in files content make sure that we get
conflict during relocation.

#require test-repo flake8

Copied from Mercurial core (60ee2593a270)

  $ cd "`dirname "$TESTDIR"`"

run flake8 on all tracked files ending in .py or with a python shebang

  $ hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' \
  > -X hgext3rd/evolve/thirdparty \
  > 2>/dev/null \
  > | xargs -0 "$PYTHON" -m flake8