Mercurial > evolve
view debian/control @ 2679:5156a67f66a6
topics: update current topic to the topic of newly rebased commit (issue5551)
The rebase code passes branchmerge equals to True while updating to the rebased
commit. We need to make sure topic is preserved even after rebase and hence we
need to update the topic even when branchmerge argument is set to True. But
there is a twist in the tale, merge also uses this part of code and we allow to
update topic when brancmerge is True, in merge cases the topic after merge will
the topic of the destination commit, not the topic of working directory parent.
So we need the function to have information about whether a rebase is going on,
and we do it by wrapping the rebase command and storing some value in the
config. This is a bit hacky but works for now. This patch fixes issue related to
loosing of topic while rebase.
Thanks to Boris Feld for the rigourous tests.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 29 Jun 2017 02:31:55 +0530 |
parents | fb5e479080d8 |
children | 790feb47ec64 |
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 (>= 3.4~), 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 (>= 3.3~), 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. . It also: - enables the "Changeset Obsolescence" feature of mercurial, - alters core command and extension that rewrite history to use this feature, - improves some aspects of the early implementation in Mercurial 2.3. . **These extensions are experimental and are not meant for production.**