Mercurial > evolve
view debian/copyright @ 4438:a6bdb02a1902
evolve: warn user if cset desc is being lost
In public divergence when merging results in same as public cset,
we only create markers to solve the divergence i.e. [(public, (other,))]
In this case if other cset had a desc which was different from public
that will be lost.
So this print out a warning message to user that desc of non-public
cset is being lost.
Changes in test files reflect the added behaviour.
| author | Sushil khanchi <sushilkhanchi97@gmail.com> |
|---|---|
| date | Sat, 09 Mar 2019 19:25:34 +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'.