Mercurial > evolve
view debian/control @ 3827:82c72eb37f85
evolve: strip the relocation commit on `hg evolve --stop`
While resolving content-divergence on multiple parents, we relocate one of the
commit on the parent of another one and then merge the divergent changesets.
Merging can leads to conflicts, and if user does `hg evolve --stop`, we need to
strip that relocated changeset too! This patch does that.
Test changes demonstrates the fix.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 11 Jun 2018 00:47:28 +0530 |
parents | e2216e0f64bf |
children | 33696e2159a7 |
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: 3.9.3 Build-Depends: mercurial (>= 4.1), python, debhelper (>= 8), python-sphinx (>= 1.0.8), imagemagick, librsvg2-bin, wget, Python-Version: >= 2.6 Homepage: https://www.mercurial-scm.org/doc/evolution/ Package: mercurial-evolve Architecture: all Depends: ${python:Depends}, ${misc:Depends}, mercurial (>= 4.1), 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.