Uncommitted changes and merge

[Steve Borho]

On Thu, 2007-09-06 at 13:16 +0200, Peter Arrenbrecht wrote:
> > Yes.
> 
> That was a bit short. Care to elaborate? I have the same woes as Lars,
> and so far mq has not solved my problems. In particular, it seems to
> not handle binary files.

If you use --git style patches, mq can handle binary files.  The easiest
way to enable them is to add to your hgrc:

[defaults]
qrefresh = --git
qnew = --git

(I thought I read somewhere you could just add 'diff = --git', but I've
never tried it)

git style patches also handle permission changes and renames.

> 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.
> 
> "hg record" looks more like a viable solution to me, but alas it is
> only slated for release in 0.9.5.

Qct will also allow you to select changes for commit (even within a
single file), you just have to configure a 2-way merge tool for it.  I
use it to move diffs out of patches all the time.  There's also this
tool:  http://sourceforge.net/projects/gquilt/

-- 
Steve Borho (steve at borho.org)
http://www.borho.org/~steve/steve.asc
Key fingerprint = 2D08 E7CF B624 624C DE1F  E2E4 B0C2 5292 F2C6 2C8C