Managing local changes I don't want to push?

[Jason Orendorff]

On 8/9/07, Martin Sjögren <martin.sjogren at jasper-da.com> wrote:
> Replacing "svn update + hg ci" with "hg pull -u" here would make that
> work for my scenario, I guess? But how about when I want to push changes
> I make? (not the ones I want to keep local, that is) Won't those changes
> depend on the MQ changeset? I suppose I could do "hg qpop" before "hg
> commit" and "hg push" and then do "hg qpush" again afterwards? Sounds a
> bit cumbersome. :(

Oh, once you enable MQ you'll be using it for everything, not just this.

MQ's command line interface is slightly unfortunate.  To commit changes
permanently, instead of using "hg commit", you do "hg qrm -r <patch-name>".
(That is not a joke, you really do have to type "rm -r".)

Only in your case, you'll do:

  hg qpop -a
  $EDITOR .hg/patches/series   # move the patch you *don't* want to push
  hg qpush <patch-name>
  hg qrm -r <patch-name>

At least, that's what I do.  If there's an easier way, please let me know.

-j