evolve: cover continue case in pubdiv when merging results in same as public This patch is the part of a series which is adding support of public divergence resolution of the case when merging results in same as pubic cset. Changes made in this patch cover the --continue flag for the case: when we had conflicts in merging. Modified lines in previously added tests reflects the changed behaviour. Also added some additional tests. I guess I have covered every possbile case in test-evolve-public-content-divergent.t While reviewing, if you see any test missed please let me know. (I think there is one test missed that I will send as a follow-up)

     1

# Copyright 2017 FUJIWARA Katsunori <foozy@lares.dti.ne.jp>

     2

#

     3

# This software may be used and distributed according to the terms of the

     4

# GNU General Public License version 2 or any later version.

     5

"""

     6

Compatibility module

     7

"""

     8

from __future__ import absolute_import

     9

    10

from mercurial import (

    11

    obsolete,

    12

)

    13

    14

getmarkers = None

    15

successorssets = None

    16

try:

    17

    from mercurial import obsutil

    18

    getmarkers = getattr(obsutil, 'getmarkers', None)

    19

    successorssets = getattr(obsutil, 'successorssets', None)

    20

except ImportError:

    21

    pass

    22

    23

if getmarkers is None:

    24

    getmarkers = obsolete.getmarkers

    25

if successorssets is None:

    26

    successorssets = obsolete.successorssets