[PATCH 2 of 2 V2-STABLE] rebase: mention --rev in the help
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Fri Feb 1 01:05:58 UTC 2013
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1359680471 -3600
# Branch stable
# Node ID cebc8c65f958c7640f91b8eea902d13de89dfdf9
# Parent 4982bb772d3e1fc0dca0d049249bc2d928d782c6
rebase: mention --rev in the help
The --rev option is included in the command usage but not explained anywhere.
This changeset add a small mention of it in the code to prevent confusion. This
small addition reference online help that are easier to update and improves at
release time
Following Wagner Bruna advises, this is added in a plain new paragraph to not
invalidate current translation this close from the release.
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -89,10 +89,13 @@ def rebase(ui, repo, **opts):
``-b`` is less precise but more convenient than ``-s``: you can
specify any changeset in the source branch, and rebase will select
the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
uses the parent of the working directory as the base.
+ For advanced usages, a third way is available through the ``--rev``
+ option. It allows to specify a strict set of changesets to rebase.
+
By default, rebase recreates the changesets in the source branch
as descendants of dest and then destroys the originals. Use
``--keep`` to preserve the original source changesets. Some
changesets in the source branch (e.g. merges from the destination
branch) may be dropped if they no longer contribute any change.
More information about the Mercurial-devel
mailing list