Mercurial > evolve
view debian/control @ 4722:7839720c7c75
rewind: make sure merge commits include files from p1 and p2
Otherwise rewinding a merge commit makes it lose all changes.
This fix populates `updates` argument of rewriteutil.rewrite() with parent
changesets. That argument is normally used for folding multiple changesets, but
in this case it's simply used to include files from p1 and p2. Usually,
rewrite() works fine using ctx.files(), but that function can return an empty
list when ctx is a merge commit.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 11 Jul 2019 17:04:08 +0800 |
parents | 5ca2da538689 |
children | 56a8fbdd6090 |
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.5), python, debhelper (>= 8), python-sphinx (>= 1.0.8), imagemagick, librsvg2-bin, wget, X-Python-Version: >= 2.7 Homepage: https://www.mercurial-scm.org/doc/evolution/ Package: mercurial-evolve Architecture: all Depends: ${python:Depends}, ${misc:Depends}, mercurial (>= 4.5), 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.