Need advice how to keep local changes without committing to mainbranch

[Andrei Vermel]

It's not very easy to keep the local changes as the top patch. This requres constant 
caring about it and a lot of manipulations with pops, pushes and patch reordering.

Actually -X switch seems to suit me most, so I wrote some batch files to call frequent hg 
commands and pass in the locally modified files with the -X switches.

I think it would be handy to have a repository dependent file similar to a one
that can be specified in .hg/hgrc under

[ui]
   ignore = ~/local.hgignore

so it can be an extra item
  exclude = ~/localexcludes

and the patterns should work as if specified with the -X key

Andrei


----- Original Message ----- 
From: Mathieu Clabaut
To: Mercurial
Sent: Wednesday, December 13, 2006 11:42 AM
Subject: Need advice how to keep local changes without committing to mainbranch

> I would have advise  to use MQ to keep your local changes and you global changes.
> You must arrange to keep your local changes on top of the queue. When it is time to
> push your global changes, qpop your local changes and then use hg qdelete -r qbase:qtip
> to delete the associated patches but keep the cset in the repo.
> You can now do a hg push and after that restore your local changes by qpushing them.
>
> -mathieu