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

[Matt Mackall]

On Thu, 2013-01-31 at 17:24 -0600, Kevin Bullock wrote:
> On 31 Jan 2013, at 4:30 PM, Pierre-Yves David wrote:
> 
> > # 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.
> > +
> 
> It seems rather clumsy to reference "changeset exchanges" in the help
> for 'rebase'. Maybe if you could word this more like:

Nevermind "changesetS exchanges".

>     In its default configuration, Mercurial will prevent you from
>     rebasing published changes. See :hg:`help phases` for details.

Yes.

-- 
Mathematics is the supreme nostalgia of our time.