evolve: update the public divergence resolution logic to cover --continue case To continue the interrupted evolve in case of public divergence: we will have to store the node of that public cset which was in content divergence with the other cset, so that we can perform the phase divergence resolution between that public cset and a newnode which is the result of content-divergence resolution. Added tests reflect the behaviour this patch adds.

     1

import hghave

     2

     3

@hghave.check("docgraph-ext", "Extension to generate graph from repository")

     4

def docgraph():

     5

    try:

     6

        import hgext.docgraph

     7

        hgext.docgraph.cmdtable # trigger import

     8

    except ImportError:

     9

        try:

    10

            import hgext3rd.docgraph

    11

            hgext3rd.docgraph.cmdtable # trigger import

    12

        except ImportError:

    13

            return False

    14

    return True