Mercurial > evolve
view debian/copyright @ 3805:2410e7063692
evolve: implement resolution of content-divergence when on differet parents
This patch implements the basic version of resolution of content-divergence
changesets when they are on different parents but one of the parent is gca of
both the different parents.
The functionality first relocates the divergent changeset which was left behind
and then resolves the content-divergence like it resolves in normal cases.
This is a very basic implementation because it still does not work on
interrupted evolution. Test changes in this patch shows the basic functionality
working. The output of dry-run is also required to be tweaked in such cased.
Upcoming patches will add more tests and will improve the implementation to work
during conflicts too.
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Fri, 01 Jun 2018 19:52:06 +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'.