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 Sushil khanchi <sushilkhanchi97@gmail.com>
Tue, 25 Jun 2019 21:54:22 +0530
changeset 4704 5f90eb8fd63c
parent 3162 e2216e0f64bf
child 4683 33696e2159a7
permissions -rw-r--r--
evolve: fix confusion in branch heads checking logic when topic in play To provide some context, when topics are in play the branchmap cache we store contains the branch info of a rev as "branch:topic" format IIUC. Assuming that is right, now in present code we don't actually cover this part that "when looking for branch heads where we also have active topic we should look for branch='branch_name:topic' instead". And we get wrong branch heads as a result. This patch make sure that we pass right candidate to find branch heads using branchmap.branchheads() by overriding the localrepo.branchheads() Changes in test file reflect the fixed behavior.
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:
3161
790feb47ec64 debian: update Mercurial version dependencies
Pierre-Yves David <pierre-yves.david@octobus.net>
parents: 1642
diff changeset 
    10
 
 mercurial (>= 4.1),
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
    11
 
 python,
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
    12
 
 debhelper (>= 8),
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
    13
 
 python-sphinx (>= 1.0.8),
569
9ff2c5ad1df7 add image magic depends
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 537
diff changeset 
    14
 
 imagemagick,
9ff2c5ad1df7 add image magic depends
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 537
diff changeset 
    15
 
 librsvg2-bin,
1275
783aa685c5d4 Update debian packaging for 5.1.3
Julien Cristau <julien.cristau@logilab.fr>
parents: 1164
diff changeset 
    16
 
 wget,
531
b18b00036355 pkg/debian: Debian packaging
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
    17
 
Python-Version: >= 2.6
1642
fb5e479080d8 project: change evolution domain to mercurial-scm
timeless@gmail.com
parents: 1617
diff changeset 
    18
 
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 
    19
 












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    20


Package: mercurial-evolve












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    21


Architecture: all












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    22


Depends:












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    23


 ${python:Depends},







536






53d3f4749ebc
pkg-debian: improve control files



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


parents: 
531

diff
changeset




    24


 ${misc:Depends},







3161






790feb47ec64
debian: update Mercurial version dependencies



Pierre-Yves David <pierre-yves.david@octobus.net>


parents: 
1642

diff
changeset




    25


 mercurial (>= 4.1),







531






b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    26


Description: evolve extension for Mercurial












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    27


 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




    28


 DVCS.












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    29


 .












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    30


 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




    31


 it may raise.












b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    32














b18b00036355
pkg/debian: Debian packaging



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


parents: 

diff
changeset




    33
















evolve