Mercurial > hg-stable

changeset 18516:9fbeb61b8ad2 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: mention phases in the help Mention that Mercurial helps you not do what you've just been warned not to do, with a reference to the 'phases' help topic (not the 'phase' command help). Thanks to Pierre-Yves David <pierre-yves.david@ens-lyon.org> for motivating this change and Wagner Bruna <wagner.bruna+mercurial@gmail.com> for advising on how to do it in an i18n-friendly way.
author Kevin Bullock <kbullock@ringworld.org>
date Thu, 31 Jan 2013 20:01:26 -0600
parents bf8bbbf4aa45
children 0c51532ec233
files hgext/rebase.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/rebase.py	Thu Jan 31 22:36:22 2013 +0100
+++ b/hgext/rebase.py	Thu Jan 31 20:01:26 2013 -0600
@@ -68,6 +68,9 @@
     same rebase or they will end up with duplicated changesets after
     pulling in your rebased changesets.
 
+    In its default configuration, Mercurial will prevent you from
+    rebasing published changes. See :hg:`help phases` for details.
+
     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