[PATCH] mq: Add a new command, 'qrebase', to obviate need for 'qsave'
Peter Williams
pwil3058 at bigpond.net.au
Mon Aug 24 18:37:03 CDT 2009
On 25/08/09 07:20, Greg Ward wrote:
> On Mon, Aug 24, 2009 at 8:49 AM, Peter Williams<pwil3058 at bigpond.net.au> wrote:
>> On 24/08/09 16:43, Dirkjan Ochtman wrote:
>>> On Mon, Aug 24, 2009 at 06:44, Peter Williams<pwil3058 at bigpond.net.au> wrote:
>>>> # HG changeset patch
>>>> # User Peter Williams<pwil3058 at bigpond.net.au>
>>>> # Date 1251088950 -36000
>>>> # Node ID 6b070b840907062dd1b65da17581ca3da75df8d1
>>>> # Parent 37042e8b3b342b2e380d8be3e3f7692584c92d33
>>>> mq: Add a new command, 'qrebase', to obviate need for 'qsave'
>>
>> This should have been 'qreparent' not 'qrebase'.
>
> Or the code should add a 'qrebase' command, which IMHO is preferable.
> Is the command in question like running
>
> hg qpop -a
> hg update tip
> hg qpush -a
hg qpush -ma
>
> but with smarter merging (ie. no more .rej files)? If so, I'd call it
> qrebase.
I was originally going to make it 'qrebase' but changed my mind when
trying to write the help message. I feel that 'qreparent' is more
compatible with the MQ terminology than 'qrebase'. I.e. considering the
semantics of the 'qparent' and 'qbase' tags. It's mostly 'qparent'
that's being changed by the command.
In fact, while walking the dog this morning, I toyed with the idea of
suggesting that 'rebase' be renamed 'reparent' but decided against it :-).
Peter
--
Peter Williams pwil3058 at bigpond.net.au
"Learning, n. The kind of ignorance distinguishing the studious."
-- Ambrose Bierce
More information about the Mercurial-devel
mailing list