[PATCH] strip: make it clear that --force discards changes (issue310)

Patrick Mézard pmezard at gmail.com
Fri Apr 29 08:10:04 CDT 2011


Le 29/04/11 10:27, Adrian Buehlmann a écrit :
> On 2011-04-29 10:00, Patrick Mezard wrote:
>> # HG changeset patch
>> # User Patrick Mezard <pmezard at gmail.com>
>> # Date 1304063769 -7200
>> # Branch stable
>> # Node ID 9398c5a7741854569e4949d6a8b4a5fd59ec7c53
>> # Parent  3eb632d9cf4268beea329e197feb9a1c6b9960f1
>> strip: make it clear that --force discards changes (issue310)
>>
>> diff --git a/hgext/mq.py b/hgext/mq.py
>> --- a/hgext/mq.py
>> +++ b/hgext/mq.py
>> @@ -2538,7 +2538,8 @@
>>  
>>      The strip command removes the specified changesets and all their
>>      descendants. If the working directory has uncommitted changes,
>> -    the operation is aborted unless the --force flag is supplied.
>> +    the operation is aborted unless the --force flag is supplied and
>> +    the changes discarded.
>>  
>>      If a parent of the working directory is stripped, then the working
>>      directory will automatically be updated to the most recent
>> @@ -3234,8 +3235,8 @@
>>            _('hg qseries [-ms]')),
>>       "strip":
>>           (strip,
>> -         [('f', 'force', None, _('force removal of changesets even if the '
>> -                                 'working directory has uncommitted changes')),
>> +         [('f', 'force', None, _('force removal of changesets, discard '
>> +                                 'uncommitted changes')),
> 
> Perhaps you can add "... (no backup)" as for -C on hg update?
> 
> <quote>
>  -C --clean      discard uncommitted changes (no backup)
> </quote>

I added this, thanks!

--
Patrick Mézard


More information about the Mercurial-devel mailing list