Mercurial > evolve

view debian/copyright @ 5788:961a940aef57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence-resolution: [patch 3] fix a messed up test case Because of logic change in divergence resolution which causes the order change in picking the resolution parent this test case was messed up. It was supposed to test that it hits merge conflict while merging the two divergent csets but because of some change in previous patches, we hit conflict early during relocation of one of the cset. This patch, by resolving the conflict for relocation make sure that we test the conflict while merging the two divergent csets.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 24 Jan 2021 20:09:28 +0530
parents e3acb8823900
children fc877278f79e
line wrap: on
line source

This software was downloaded from
https://www.mercurial-scm.org/repo/evolve/

Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
               Logilab SA        <contact@logilab.fr>
               Pierre-Yves David <pierre-yves.david@ens-lyon.org>
	       Patrick Mezard <patrick@mezard.eu>


This software may be used and distributed according to the terms of the GNU
General Public License version 2 or any later version.

On Debian systems, the complete text of the GNU General Public License version
2 can be found in `/usr/share/common-licenses/GPL-2'.