evolve: add condition in case of pubdiv to not swap the two div csets In public divergence, we have pinned the public cset to the local side when merge is performed. And in divergence resolution implementation divergent cset is the one who is kept at the local side, so to say this in one line: we have pinned public cset to the divergent side. However, in some cases we need to swap the "divergent" and "other" but we can't swap them in case of public divergence as thought would cause an error because of not being able to relocate public cset.

     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