evolve: add condition in case of pubdiv to not swap the two div csets In public divergence, we have pinned the public cset to the local side when merge is performed. And in divergence resolution implementation divergent cset is the one who is kept at the local side, so to say this in one line: we have pinned public cset to the divergent side. However, in some cases we need to swap the "divergent" and "other" but we can't swap them in case of public divergence as thought would cause an error because of not being able to relocate public cset.

     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