Need advice how to keep local changes without committing to main branch

[Matt Mackall]

On Wed, Dec 13, 2006 at 09:42:02AM +0100, Mathieu Clabaut wrote:
> On 12/12/06, Andrei Vermel <avermel at mail.ru> wrote:
> >
> >I need to regularly commit changes to the main branch, but there are some
> >local changes
> >that I do not want to commit. Also I'd like to be able to resolve
> >conflicts if the locally
> >changed files get changed in the main branch.
> >MQ doesn't help as far as I can tell, as with patches applied I can't
> >commit easily -
> >would need to qpop / qpush all the time. I can't add the files to the
> >.hgignore either,
> >since they are managed by hg.

Use a couple repos. For example:

work: do work that may get pushed upstream here
local-only: make your local changes here and pull changes from work
  into it

-- 
Mathematics is the supreme nostalgia of our time.