Mercurial > evolve

annotate debian/copyright @ 4688:75329efe56a9 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: demonstrate obsmarker creation after discarding conflicting changes Continued evolve creates an incorrect obsmarker that says 2 is a successor of 1. It's incorrect because 1 was dropped as it created no changes to commit (after conflict resolution that discarded its changes). If evolve does the same thing in one go (e.g. just by using --tool :local and without subsequent need to continue) the obsmarker is correct.
author Anton Shestakov <av6@dwimlabs.net>
date Sat, 22 Dec 2018 18:31:32 +0800
parents e3acb8823900
children fc877278f79e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
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