evolve: fix the broken behaviour on div resolution in relocation case In content divergence resolution, I see that when "relocationreq" is True which means both the cset are on different parent and relocation is required. In this case when "divergent" is the one who is behind the "other" cset in DAG, we swap them. At this point one thing we missed is to update the evolvestate['divergent']. Because of this in continue case we didn't get the right value of obsmarkers creation. In this patch I added the code to update the evolvestate when we swap them. Now as we know "divergent" and "other" can be swapped in some cases, it is better to store the intial divergent separately in evolvestate which is evolvestate['orig-divergent'] and later this value is used to update the evolvestate['replacements'] which is the track of revisions which has been resolved. Changes in tests demonstrate the fixed behaviour.

     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.