evolve: add logic to resolve content-divergence with a public cset Public content-divergence is the divergence where a cset is content-divergent with a public cset. To solve public divergence: 1) perform content-divergent resolution 2) resultant node is phase divergent 3) perform phase divergence resolution It is the intial logic to solve public divergence. Next patches will be the covering the cases of: 1) relocation: when we need to relocate to node 2) continue: to add this resolution in case of --continue 3) the case when content-divergence resolution gives a result similar to public cset. Added test-evolve-public-content-divergent.t reflect the added behaviour.

     1

This software was downloaded from

     2

https://www.mercurial-scm.org/repo/evolve/

     3

     4

Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>

     5

               Logilab SA        <contact@logilab.fr>

     6

               Pierre-Yves David <pierre-yves.david@ens-lyon.org>

     7

	       Patrick Mezard <patrick@mezard.eu>

     8

     9

    10

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

    11

General Public License version 2 or any later version.

    12

    13

On Debian systems, the complete text of the GNU General Public License version

    14

2 can be found in `/usr/share/common-licenses/GPL-2'.

    15