Mercurial > evolve

view debian/control @ 5601:3946ee4ee3ae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: add a `exp….topic.linear-merge` option to allow some oedipus If this option is set to `from-branch`, a user can call `hg merge some-topic` from a bare branch even if `some-topic` is a direct descendant of the current working copy parents. This was previously denied if the changesets was on the same branch, since the result would be an "oedipus merge". Some user have been requesting this, and this type of merge is one of Gitlab standard way of merging a "Merge Request". That new option will unlock issue `heptapod#200` and make this mode available for those who wants it.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 14 Oct 2020 15:48:37 +0200
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.