Mercurial > evolve
annotate debian/control @ 4728:ef8907df73fc stable
touch: fix the inconsistent behavior of divergence catching logic (issue6107)
When touching a node, the way we check if it can lead to divergence
is we look at the successors sets of the rev being touched. And if
there is successor revs exists (excluding the case when that successor
set is (A,) for rev A) that means there will be divergence and we warn
the user.
This works fine but there is still a case (which is not covered by looking
at successor sets) which can lead to divergence.
That case is: when there is already a revision exists which is divergent
to the revision being touched. And performing the touch would revive
that "dead" divergence. (Dead because one of the revision is obsolete which
is the one we are touching)
And to see if there is any rev which is divergent to a particular rev
we already have a function which we can use here
i.e. `evolvecmd.divergentsets(repo, ctx_being_touched)`
Changes in test file demonstrate the fixed behaviour.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Wed, 17 Jul 2019 17:58:44 +0200 |
parents | 5ca2da538689 |
children | 56a8fbdd6090 |
rev | line source |
---|---|
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: |
4683
33696e2159a7
packaging: require mercurial >= 4.5
Philippe Pepiot <philippe.pepiot@logilab.fr>
parents:
3162
diff
changeset
|
10 mercurial (>= 4.5), |
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, |
4685
5ca2da538689
packaging: follow hg's supported python version (>= 2.7)
Anton Shestakov <av6@dwimlabs.net>
parents:
4684
diff
changeset
|
17 X-Python-Version: >= 2.7 |
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}, |
4684
cfa774ca6560
packaging: require hg 4.5 also for usage, not just for building
Anton Shestakov <av6@dwimlabs.net>
parents:
4683
diff
changeset
|
25 mercurial (>= 4.5), |
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 |