howto push uncommited changes to some unapplied patch?
Nicolas Dumazet
nicdumz at gmail.com
Tue Dec 1 00:10:27 CST 2009
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.
Now push up to the target patch:
$ hg qgoto target
And fold will_fold_this into target:
$ hg qfold will_fold_this
>
>
> -- Dilip
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
--
Nicolas Dumazet — NicDumZ
More information about the Mercurial
mailing list