Mercurial > evolve

view debian/control @ 5788:961a940aef57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
divergence-resolution: [patch 3] fix a messed up test case Because of logic change in divergence resolution which causes the order change in picking the resolution parent this test case was messed up. It was supposed to test that it hits merge conflict while merging the two divergent csets but because of some change in previous patches, we hit conflict early during relocation of one of the cset. This patch, by resolving the conflict for relocation make sure that we test the conflict while merging the two divergent csets.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 24 Jan 2021 20:09:28 +0530
parents d8d749cd6950
children 18aa756353a7
line wrap: on
line source

Source: mercurial-evolve
Section: vcs
Priority: optional
Maintainer: Logilab <contact@logilab.fr>
Uploaders:
 Julien Cristau <julien.cristau@logilab.fr>,
 Pierre-Yves David <pierre-yves.david@logilab.fr>,
Standards-Version: 4.3.0
Build-Depends:
 mercurial (>= 4.6),
 python,
 python3,
 debhelper (>= 10),
 dh-python,
 python-sphinx,
 imagemagick,
 librsvg2-bin,
 graphviz,
X-Python3-Version: >= 3.6
Homepage: https://www.mercurial-scm.org/doc/evolution/
Vcs-Browser: https://www.mercurial-scm.org/repo/evolve/
Vcs-Hg: https://www.mercurial-scm.org/repo/evolve/

Package: mercurial-evolve
Architecture: all
Depends:
 ${python:Depends},
 ${python3:Depends},
 ${misc:Depends},
 ${sphinxdoc:Depends},
 mercurial (>= 4.6),
Built-Using: ${sphinxdoc:Built-Using}
Description: evolve extension for Mercurial
 This package provides the experimental "evolve" extension for the Mercurial
 DVCS.
 .
 This extension provides several commands to mutate history and deal with issues
 it may raise.