tests: add tests for resolving content-divergence when different parents This patch adds more tests for cases when we try to resolve content-divergence when they are on different parents. The last test shows the we are somehow missing the relocated commit in interrupted transaction. This will be fixed in next patch.

     1

#require test-repo pyflakes

     2

     3

Copied from Mercurial core (60ee2593a270)

     4

     5

  $ cd "`dirname "$TESTDIR"`"

     6

     7

run pyflakes on all tracked files ending in .py or without a file ending

     8

(skipping binary file random-seed)

     9

    10

  $ hg locate 'set:(**.py or grep("^#!.*python")) - removed()' 2>/dev/null \

    11

  > | xargs pyflakes 2>/dev/null