Clarification of conflict/merging

[Curry, Matthew J CIV NSWCCD W. Bethesda, 7320]

Hello all,

One of my coworkers had a problem with Mercurial lately, and I'd like to clarify things a bit with merging and conflicts, as well as the commands to fix problems.
The situation: the merge program indicated by ~/.hgrc did not exist, so a merge conflict failed on a pull/update -m.

First, when any merge fails, Mercurial won't alter the local working dir, right?  But there will still be the pulled changesets in the repository?

Second, wouldn't be a good idea to have Mercurial fall back on the default behaviour, if a merge program isn't found, so that a merge can continue?

To fix, I bascially 'hg clone -r' back, and remerged.  Also, I figured out later doing an 'hg update -C <his locally commited rev>' and then remerging seemed to work, without making another repository.

To recap the commands (again - I know, I know):
clone -r <rev>  -  clones repository, with tip at <rev>
update -C <rev> - updates working directory to <rev>, modifying parents, leaving tip alone
revert -r <rev> - update working directory to <rev>, without modifying parents or tip
hg undo - easy, undos last pull or commit (aside: are there plans to make it go back further then one step?)

So do I have the gist of it?

Matthew J Curry
Naval Surface Warfare Center Code 732
Tel: 301.227.2080

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20051219/6498302b/attachment-0001.html>