evolve: fix divergence resolution when not merging a descendant In divergence resolution, when we merge other cset with divergent one we pass a `mergeancestor` arg to merge.update() and before this patch we were passing `mergeancestor` as True in every case. But it should be True only when we are merging a descendant onto an ancestor. When mergeancestor is True it does two things: 1) allows the merge if the destination is the same as the parent of the ctx (so we can use graft to copy commits) 2) informs update that the incoming changes are newer than the destination so it doesn't prompt about "remote changed foo which local deleted". So this patch change it to pass `mergeancestor` as True only when it is required. And changes in test file shows that it wasn't prompting either in those cases when it should (acc. to 2nd point) Test written by Pierre-Yves David, based the one updated in 5dbaabfe2c59.

     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.