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>
Mon, 04 Jun 2018 04:03:02 +0530
changeset 3790 5b9e3aaa6da8
parent 2557 e3acb8823900
permissions -rw-r--r--
evolve: prompt user for branch selection while resolving content-divergence When resolving content-divergence, there can be case when both the content-divergent changesets are on different named branches. In that case, we are not sure which branch should the resolution commit should be on. This patch adds logic to prompt user to choose the branch which the resolution commit should be on and then creates the new resolution commit on that branch. This also adds a new test file which have tests for the branch selection feature we have added.
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