evolve: handle stabilization of merge changeset with both parents obsoleted This patch adds logic to stabilize an orphan merge changeset having both parents obsoleted. The logic tries to first stabilize the merge changeset on successor of second parent and then stabilize the new changeset formed on the successor of first parent. We are stabilizing on second parent first and then to second parent to preserve the first parent's successor as first parent of the merge changeset. Conflicts can occcur and we can loose processing information, therefore we store a variable in statefile `orphanmerge` which represents whether we are processing a merge changeset with both parents obsoleted. Thanks to Pierre-Yves David for suggesting this way and helping to understand the correctness of this. More rigourous test cases for this will be added in next patch.

     1

syntax: re

     2

/figures/[^/]+\.png$

     3

^html/

     4

\.pyc$

     5

~$

     6

\.swp$

     7

\.orig$

     8

\.rej$

     9

^tests/.*\.err$

    10

^tests/easy_run.sh$

    11

^build/

    12

^dist/

    13

^MANIFEST$

    14

^docs/tutorials/.*\.rst$

    15

\.ico$

    16

tests/\.testtimes

    17

    18

^docs/training/graphs/

    19

^docs/training/html/

    20

^docs/training/index.html

    21

^docs/training/graphviz-images/

    22

^docs/training/img/

    23

^docs/training/output/

    24

^docs/training/pandocfilters/