[PATCH 1 of 2 STABLE] rebase: add a mention of phases in the help

Pierre-Yves David pierre-yves.david at ens-lyon.org
Thu Jan 31 16:30:55 CST 2013


# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at ens-lyon.org>
# Date 1359671419 -3600
# Branch stable
# Node ID cb4cb6437ca0931d03b8b4f2caeec03983b2fc98
# Parent  2a1fac3650a5b4d650198604c82ab59969500374
rebase: add a mention of phases in the help

This changeset points the user to the phases section of the help right after the
paragraph warning about potential issue. The phases section should do a much
better job at explaining current security and potential remaining danger.

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
@@ -66,10 +66,13 @@ def rebase(ui, repo, **opts):
     You should not rebase changesets that have already been shared
     with others. Doing so will force everybody else to perform the
     same rebase or they will end up with duplicated changesets after
     pulling in your rebased changesets.
 
+    See :hg:`help phases` for details on interaction between
+    changesets exchanges and history rewriting.
+
     If you don't specify a destination changeset (``-d/--dest``),
     rebase uses the tipmost head of the current named branch as the
     destination. (The destination changeset is not modified by
     rebasing, but new changesets are added as its descendants.)
 


More information about the Mercurial-devel mailing list