[PATCH] mq: Add a new command, 'qrebase', to obviate need for 'qsave'

Christian Boos cboos at neuf.fr
Tue Aug 25 00:49:48 CDT 2009


Christian Boos wrote:
> Christian Boos wrote:
>   
>> OTOH, how many people knew that rebase worked well with MQ patches? 
>>     
>
> ... and I assumed that would be the case by reading recent messages in 
> the mailing list.
>
> However, *snip* this a serious bug/limitation in 
> rebase which can't handle cumulative modifications?
>   

Really sorry for the monologue, but I just found out that the above 
corresponds to:  http://mercurial.selenic.com/bts/issue1561 "unnecessary 
merge conflicts in rebase".

There's unfortunately no sign that this bug could get resolved anytime 
soon, the last message being "Bad news..." 2 months ago, by the author 
of the rebase extension.

In the light of this, I wouldn't advise the use of rebase in the context 
of MQ, as having overlapping changes in a series of patches is quite 
common, I think.

-- Christian


More information about the Mercurial-devel mailing list