Mercurial > evolve

view debian/copyright @ 4483:7978230faa32 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: make sure div resolution don't replace the initial author (issue6113) Before this patch, divergence resolution logic taking the current user who is running the resolution command as the author of commit that will be created after merging the two divergent csets. This patch make sure that we preserve the initial author. Changes in test file reflect the fixed behaviour.
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Wed, 10 Apr 2019 15:37:29 +0200
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'.