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 Pulkit Goyal <7895pulkit@gmail.com>
Thu, 14 Jun 2018 01:39:33 +0530
changeset 3850 340cf6fbe9e9
parent 2557 e3acb8823900
permissions -rw-r--r--
evolve: create resolved cset on successors of current parents While resolving content-divergence, sometimes, the parent can be obsolete and have a successor. We should consider the successors of the parents instead of obsolete parents as that will do something like orphan+content-divergence resolution both at the same time which is powerful and results in a single stack while resolving content-divergence of stacks. The test changes demonstrates that we can now successfully evolve a content divergent stack.
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
2557
e3acb8823900 url: update url to point to https://www.mercurial-scm.org/repo/evolve
André Sintzoff <andre.sintzoff@gmail.com>
parents: 1617
diff changeset 
     2
 
https://www.mercurial-scm.org/repo/evolve/
531
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