Uncommitted changes and merge

[Bela Babik]

> That was a bit short. Care to elaborate? I have the same woes as Lars,

My first step was on the road to read the hgbook:

> and so far mq has not solved my problems. In particular, it seems to
> not handle binary files.

It should with the --git option:
http://hgbook.red-bean.com/hgbookap1.html
search for: Generating safe binary diffs

> And I think it is difficult to untangle a bunch of changes into
> disparate patches after the fact. So when you get carried away
> changing unrelated stuff, mq does not help, I think.

I tried to use mq, but didn't work out for me. Named branches are
enough for what I am doing with hg.

> "hg record" looks more like a viable solution to me, but alas it is
> only slated for release in 0.9.5.

I would never use hg record, but that's me.
I used to do a final review and remove all temporal code in the final commit.

> 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.

Try hg merge -f. But I think that's not going to do what you would
like to happen.
In mercurial you records changes against the whole tree, not like in
CVS or SVN where you can handle files separately.

Qct and Mq can help if you are working on multiple thinks parallel,
but there is that great book and a lot of scenarios are laid out
really well.

teki