Patchwork [1,of,2,V2-STABLE] rebase: add a mention of phases in the help

login
register
mail settings
Submitter Pierre-Yves David
Date Feb. 1, 2013, 1:05 a.m.
Message ID <4982bb772d3e1fc0dca0.1359680757@yamac.lan>
Download mbox | patch
Permalink /patch/780/
State Superseded
Headers show

Comments

Pierre-Yves David - Feb. 1, 2013, 1:05 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
# Date 1359680445 -3600
# Branch stable
# Node ID 4982bb772d3e1fc0dca0d049249bc2d928d782c6
# 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.
Pierre-Yves David - Feb. 1, 2013, 2:41 a.m.
On 1 févr. 2013, at 03:39, Kevin Bullock wrote:

> On 31 Jan 2013, at 7:05 PM, Pierre-Yves David wrote:
> 
>> # HG changeset patch
>> # User Pierre-Yves David <pierre-yves.david@ens-lyon.org>
>> # Date 1359680445 -3600
>> # Branch stable
>> # Node ID 4982bb772d3e1fc0dca0d049249bc2d928d782c6
>> # 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,16 @@ 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.
>> 
>> +    In its default configuration, Mercurial will prevent you from
>> +    rebasing published changes. See :hg:`help phases` for details.
>> +
>> +    See :hg:`help phases` for details on interaction between
>> +    changesets exchanges and history rewriting.
>> +
> 
> Crewed just the paragraph I wrote.

yeah, the second one should not have been there at all.

Patch

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -66,10 +66,16 @@  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.
 
+    In its default configuration, Mercurial will prevent you from
+    rebasing published changes. See :hg:`help phases` for details.
+
+    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.)