[PATCH] mq: adapt documentation of qpush -f to its function ...

S. Heimberg simohe at besonet.ch
Wed Aug 20 04:55:18 CDT 2008


The title of the issue1179 is "qpush -f merges local changes instead of
discarding them", so you are right. 
The description for qpush -f is 'apply if the patch has rejects'. What does
this mean exactly? There is not written anything about local changes or
mergeing. Should there be something?

As dduvall writes, qpop -f merges the local changes. But the description
says something different. I think the patch is ok, but it does not fix
issue1179.

On Wed, 20 Aug 2008 08:29:44 +0000 (UTC), Dirkjan Ochtman
<dirkjan at ochtman.nl> wrote:
> S. Heimberg <simohe <at> besonet.ch> writes:
>> @@ -2397,7 +2397,7 @@
>>          (pop,
>>           [('a', 'all', None, _('pop all patches')),
>>            ('n', 'name', '', _('queue name to pop')),
>> -          ('f', 'force', None, _('forget any local changes'))],
>> +          ('f', 'force', None, _('merge any local changes in
> destination
>> patch'))],
> 
> This changes the docs for qpop, not for qpush. That's not as intended,
> right?
> 
> Cheers,
> 
> Dirkjan
> 
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel



More information about the Mercurial-devel mailing list