partial commits

[Gilles Moris]

On Thu August 6 2009 23:51:47 Edward Peschko wrote:
> Why? Couldn't mercurial do automatically what I need to do manually,
> namely make a patch based on the current branch, move it to a separate
> location, do the merge, and then apply the patch on top of it? If this
> functionality is already available, how do I do this?
> 

It seems that you want another working directory to perform your merge.
So create another clone and pull your 1-file commit.
Pull from the upstream repo and merge. Commit the merge.
Push the result in your original working directory.

That's the most natural way to work with Mercurial, and it doesn't require
to setup any extension.

That makes 2 different working directory, but it makes sense as that's two
different area for different tasks.
See below for how to organize your different working directories:
http://mercurial.selenic.com/wiki/WorkingPractices

Regards.
Gilles.