temporary changesets?

[Brendan Cully]

On Wednesday, 04 July 2007 at 12:08, Shridhar Daithankar wrote:
> On Wednesday 04 July 2007 11:46, Brendan Cully wrote:
> > Have you seen the imerge extension?
> >
> > http://www.selenic.com/mercurial/wiki/index.cgi/ImergeExtension
> 
> Could you please elaborate on use of imerge and intermediate commit i.e. 
> committing while the merge is in progress?

Sure: don't do that. To save a merge that is in progress, use hg
imerge save. This produces a file containing the merge state (parents,
conflicts, and current resolutions). When the merge is loaded with hg
imerge load, the merge is repeated and the conflict resolutions in the
state file are then applied.