evolve: add logic to handle a particular case in divergence resolution Case is: In content divergence, to check if the two csets are on different parent or same parent what we do is find gca of the two csets and then compare it with the singlesuccessors of two csets's parents. Now, if gca is same as singlesuccessors of both the csets then we conclude that both are on the same parent which is not totally correct as it is possible that both the parents of two csets are obsolete with a single successor. This patch adds the logic to cover the above metioned case correctly, deciding the part when we need to relocate a cset to other side while resolving the stack of divergent csets. Changes in test file demonstrate that before this patch we were not doing it right because it should have relocated every node to other side instead of just relocating the first one from the stack.

     1

Doc is generated with sphinx.

     2

     3

You can generate the doc with:

     4

     5

```

     6

make

     7

```

     8

     9

# Tutorials

    10

    11

For updating the tutorials, you need to have the docgraph extension installed

    12

(https://pypi.python.org/pypi/hg-docgraph).

    13

    14

Then run the test-topic-tutorial.t and test-tutorial.t to update the output if

    15

needed.

    16

    17

You'll need the dot binary (likely installed by the graphviz package in your

    18

package manager) in order to have graphviz graphs rendered in the html output.

    19

    20

Simply run make in the docs directory should takes care of the conversion of

    21

the tutorial .t files into .rst files. Then sphinx should do the rest of the

    22

jobs by rendering graphviz graphs.