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/control
author Martin von Zweigbergk <martinvonz@google.com>
Thu, 30 Apr 2020 10:05:14 -0700
changeset 5341 13376ca93fa3
parent 5295 d605cc18549d
permissions -rw-r--r--
evolve: always create commit when resolving divergence When resolving content-divergence, the final commit we create may end up empty (which means that Mercurial won't even create it). We've had code for handling that in evolve ever since 41bf6c27a122 (evolve: stabilize now handle conflicting changeset, 2012-08-23). However, that resolved the issue by marking on the divergent commits as successor. As Pierre-Yves has pointed out (in other code reviews), we should instead be creating a new successor. So that's what this patch does. It does that by setting `ui.allowemptycommit` while creating the final commit. However, that is not enough, because we may end up creating the same nodeid as already existed (we'd then end up trying to mark the "new" commit a successor of itself). To solve that, we add some salt to the commit extras. That salt affects lots of tests.
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
 
Source: mercurial-evolve
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     2
 
Section: vcs
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     3
 
Priority: optional
537
6b459431d215 pkg-debian: fix uploader fields
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 536
diff changeset 
     4
 
Maintainer: Logilab <contact@logilab.fr>
6b459431d215 pkg-debian: fix uploader fields
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 536
diff changeset 
     5
 
Uploaders:
6b459431d215 pkg-debian: fix uploader fields
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 536
diff changeset 
     6
 
 Julien Cristau <julien.cristau@logilab.fr>,
6b459431d215 pkg-debian: fix uploader fields
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 536
diff changeset 
     7
 
 Pierre-Yves David <pierre-yves.david@logilab.fr>,
536
53d3f4749ebc pkg-debian: improve control files
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset 
     8
 
Standards-Version: 3.9.3
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     9
 
Build-Depends:
5295
d605cc18549d packaging: bump minimum required version of mercurial in debian/control
Anton Shestakov <av6@dwimlabs.net>
parents: 4913
diff changeset 
    10
 
 mercurial (>= 4.6),
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
    11
 
 python,
4913
cac7e750422f debian: also build with python3
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 4912
diff changeset 
    12
 
 python3,
4912
43e9bb4de6b5 debian: update debhelper compat
Denis Laxalde <denis@laxalde.org>
parents: 4909
diff changeset 
    13
 
 debhelper (>= 10),
4909
56a8fbdd6090 debian: use pybuild and dh_sphinxdoc
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 4685
diff changeset 
    14
 
 dh-python,
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
    15
 
 python-sphinx (>= 1.0.8),
569
9ff2c5ad1df7 add image magic depends
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 537
diff changeset 
    16
 
 imagemagick,
9ff2c5ad1df7 add image magic depends
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 537
diff changeset 
    17
 
 librsvg2-bin,
1275
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1164
diff changeset 
    18
 
 wget,
4909
56a8fbdd6090 debian: use pybuild and dh_sphinxdoc
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 4685
diff changeset 
    19
 
 sphinx-common,
4685
5ca2da538689 packaging: follow hg's supported python version (>= 2.7)
Anton Shestakov <av6@dwimlabs.net>
parents: 4684
diff changeset 
    20
 
X-Python-Version: >= 2.7
4913
cac7e750422f debian: also build with python3
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 4912
diff changeset 
    21
 
X-Python3-Version: >= 3.6
1642
fb5e479080d8 project: change evolution domain to mercurial-scm
timeless@gmail.com
parents: 1617
diff changeset 
    22
 
Homepage: https://www.mercurial-scm.org/doc/evolution/
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
    23
 












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    24


Package: mercurial-evolve












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    25


Architecture: all












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    26


Depends:












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    27


 ${python:Depends},







4913






cac7e750422f
debian: also build with python3



Denis Laxalde <denis.laxalde@logilab.fr>


parents: 
4912

diff
changeset




    28


 ${python3:Depends},







536






53d3f4749ebc
pkg-debian: improve control files



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


parents: 
531

diff
changeset




    29


 ${misc:Depends},







4909






56a8fbdd6090
debian: use pybuild and dh_sphinxdoc



Denis Laxalde <denis.laxalde@logilab.fr>


parents: 
4685

diff
changeset




    30


 ${sphinxdoc:Depends},







5295






d605cc18549d
packaging: bump minimum required version of mercurial in debian/control



Anton Shestakov <av6@dwimlabs.net>


parents: 
4913

diff
changeset




    31


 mercurial (>= 4.6),







4909






56a8fbdd6090
debian: use pybuild and dh_sphinxdoc



Denis Laxalde <denis.laxalde@logilab.fr>


parents: 
4685

diff
changeset




    32


Built-Using: ${sphinxdoc:Built-Using}







531






b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    33


Description: evolve extension for Mercurial












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    34


 This package provides the experimental "evolve" extension for the Mercurial












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    35


 DVCS.












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    36


 .












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    37


 This extension provides several commands to mutate history and deal with issues












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    38


 it may raise.












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    39














b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    40
















evolve