Mercurial > evolve

view debian/copyright @ 1467:5c385b812500 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: dedupe divergents when running evolve --all --any or evolve --rev Before this patch, when running evolve --all --any or evolve --rev with the --divergent flag, we were selecting all of the divergents. After solving the first one, its counterparts would get pruned and potentially hidden which would crash when trying to resolve them. This patch introduces logic to dedupe the divergents to be resolved by keeping only one per group of divergent with the lower revision number.
author Laurent Charignon <lcharignon@fb.com>
date Wed, 24 Jun 2015 16:54:23 -0700
parents b18b00036355
children 160968654581
line wrap: on
line source

This software was downloaded from
https://bitbucket.org/marmoute/mutable-history

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'.