evolve: abort if deciding resolution parent is ambiguous While solving content-divergence, it could be hard to decide which cset should be treated as a resolution parent if there are multiple successors of divergent cset. i.e split case. But we are planning to make some update in handling this split case: 1) consider highest one if all splitted csets are in a single topological branch 2) still need to decide if 1) doesn't apply

     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 -I 'set:(**.py or grep("^#!.*python")) - removed()' 2>/dev/null \

    11

  > | xargs pyflakes 2>/dev/null