Uncommitted changes and merge

[Lars Lundgren]

Hi.

I have recently moved from cvs to hg. 

I'm trying to follow the Commit Early Commit Often principle. However
I often get bitten by merge problems due to uncommitted local changes.

I usually have two kinds of local uncommitted changes:

1. Local debug stuff that I have no intention of committing.

2. Some local changed are not ready yet, but I want to commit those
   that are ready.


Before I commit I take it as habit to pull and update from the main
repo. Then hg refuses to merge because I have local changes - even
though there is no intersection between my set of committed files, my
locally changed files, and the pulled changes.

I try to limit my merge problems by whenever I want to commit do the
full sequence: pull, update, merge, commit, push. However I then get
the feeling that I was better of using cvs :(


What am I doing wrong?

How should I work with hg instead?

Is mq the solution to my problems?

All help will be greatly appreciated.

Kind regards,
Lars L