howto push uncommited changes to some unapplied patch?
Kyle Altendorf
kyle.altendorf at gmail.com
Fri Dec 4 15:17:32 CST 2009
On Fri, Dec 4, 2009 at 2:53 AM, Dilip M <dilipm79 at gmail.com> wrote:
> On Tue, Dec 1, 2009 at 11:40 AM, Nicolas Dumazet <nicdumz at gmail.com> wrote:
>> 2009/12/1 Dilip M <dilipm79 at gmail.com>:
>>> Hello,
>>>
>>> I have some 3 patches in queue and I have done hg qpop -a. I have done some
>>> change to a file, which has to be incorporated in some of the patch in
>>> queue.
>>>
>>> qnew -f will only force those changes to go into _new_ patch. But how can
>>> in push those uncommitted changes into one of the patch in queue?
>>
>> You can qnew -f to create a new change, reorder the patch series, and fold
>> the newly created patch with the target patch?
>>
>> aka :
>> $ hg qser
>> before
>> target
>> after
>> $ hg st
>> (changes you want into "target")
>> $ hg qnew -f will_fold_this
>> $ hg qpop
>> patch queue now empty
>>
>> Now reorder the serie to have the patch just after the target:
>>
>> $ $EDITOR .hg/patches/series
>>
>> change from:
>> will_fold_this
>> before
>> target
>> after
>>
>> to:
>>
>> before
>> target
>> will_fold_this
>> after
>>
>> Save, quit.
>
> Is there any option within MQ to mess with series? :) Just asking..
Not to discredit the qup extension but from:
http://mercurial.selenic.com/wiki/MqExtension#Using_Mercurial_Queues
You are told:
> You can change the patch order simply by moving them around in
> the series file. Make sure to only change entries in the series file for
> patches that are not currently applied.
-kyle
>
>
>
>
> --
> Dilip
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
More information about the Mercurial
mailing list