Mercurial Queues: combining patches

Question

I've been playing with Mercurial and mercurial queues, and now have a fairly reasonable working version. However, before I submit a patch, I'd like to take that spagetti-history and merge it into discrete, logical steps, rather than the semi-overlapping repeated do-undo-redo-slightly-differently mess it is now, if only to reduce the number of patches.

How do I do that?

Answer 1

hg qfold is the way to go. Be very careful with it. Make sure you have read all the instructions beforehands. It's reasonable to version your patchqueue too (as a nested repoository), so you have backups:

hg qinit [-c]

init a new queue repository

The queue repository is unversioned by default. If -c is specified, qinit will create a separate nested repository for patches (qinit -c may also be run later to convert an unversioned patch repository into a versioned one). You can use qcommit to commit changes to this queue repository.