Mercurial > evolve

view debian/copyright @ 4990:f3fd3c1c3da0 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add test to demonstrate issue6203 Current logic of content-divergence resolution contains a bug that if resolution parent is not the parent of any of the two divergent changesets, it could undo some changes. I think a good solution for this is to first relocate the divergent cset to it's obsolete parent's successor if applicable and then perform the content-divergence resolution. Next patch will fix the issue.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 23 Nov 2019 20:25:16 +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'.