Mercurial > hg
view hgext/strip.py @ 45976:cf04af3a5ef1
copies: fast path no-op merge
If the two sides of the merge are the same (they come an unaltered common
ancestors) we don't need any merging.
Differential Revision: https://phab.mercurial-scm.org/D9415
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 20 Nov 2020 10:49:32 +0100 |
parents | d7a508a75d72 |
children | 6000f5b25c9b |
line wrap: on
line source
"""strip changesets and their descendants from history (DEPRECATED) The functionality of this extension has been included in core Mercurial since version 5.7. Please use :hg:`debugstrip ...` instead. This extension allows you to strip changesets and all their descendants from the repository. See the command help for details. """ from __future__ import absolute_import from mercurial import commands # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should # be specifying the version(s) of Mercurial they are tested with, or # leave the attribute unspecified. testedwith = b'ships-with-hg-core' # This is a bit ugly, but a uisetup function that defines strip as an # alias for debugstrip would override any user alias for strip, # including aliases like "strip = strip --no-backup". commands.command.rename(old=b'debugstrip', new=b'debugstrip|strip')