hg resolve quite cumbersome

[Arne Babenhauserheide]

Hi, 

firstoff: hg resolve is very nice for tracking merges. 

At the same time it is vrey cumbersome, though. 

I just merged and got an conflict. So I solved it in the file and wanted to 
commit. 
Mercurial then told me that I'd have to use hg resolve, though tehre weren't 
any conflicts left. 

What I expected: 

hg merge
# resolve conflicts
hg ci -m "merged"

or 

hg merge
# resolve conflicts
hg resolve -m 
# automatically commit, because nothing unresolved is leftover. 

What I got instead: 

hg merge
# read the warning about having to use hg resolve
hg resolve
# merging file
# warning: conflicts during merge.
# merging file failed!
# -> resolve conflicts
hg resolve -m
hg ci -m "merged"


Is there a way to avoid that additional command but keep the workflow clean? 


I also think the error message in hg resolve should note that "hg resolve -m" 
will set all merges to resolved. 

(for example: "After merging by hand you can set files as resolved via hg 
resolve -m")

Besides that I like the way I can merge with hg resolve  - I think it's a 
great idea! 

Best wishes, 
Arne
-- 
-- My stuff: http://draketo.de - stories, songs, poems, programs and stuff :)
-- Infinite Hands: http://infinite-hands.draketo.de - singing a part of the 
history of free software.
-- Ein Würfel System: http://1w6.org - einfach saubere (Rollenspiel-) Regeln.

-- PGP/GnuPG: http://draketo.de/inhalt/ich/pubkey.txt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
Url : http://selenic.com/pipermail/mercurial/attachments/20081213/720466bd/attachment.pgp