Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debian/copyright
author Laurent Charignon <lcharignon@fb.com>
Wed, 24 Jun 2015 16:54:23 -0700
branchstable
changeset 1467 5c385b812500
parent 531 b18b00036355
child 1617 160968654581
permissions -rw-r--r--
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.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     1
 
This software was downloaded from
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     2
 
https://bitbucket.org/marmoute/mutable-history
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     3
 












b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     4


Copyright 2011 Peter Arrenbrecht <peter.arrenbrecht@gmail.com>













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     5


               Logilab SA        <contact@logilab.fr>













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     6


               Pierre-Yves David <pierre-yves.david@ens-lyon.org>













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     7


	       Patrick Mezard <patrick@mezard.eu>













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     8














b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     9














b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    10


This software may be used and distributed according to the terms of the GNU













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    11


General Public License version 2 or any later version.













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    12














b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    13


On Debian systems, the complete text of the GNU General Public License version













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    14


2 can be found in `/usr/share/common-licenses/GPL-2'.













b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    15
















evolve