hg resolve quite cumbersome

[Arne Babenhauserheide]

Am Montag 15 Dezember 2008 07:47:00 schrieb Peter Arrenbrecht:
> I normally get:
>
> hg merge
> -> meld pops up and I do the merge, or cancel it
> # for every cancelled merge, if any:
> hg resolve
> hg resolve -m
> hg commit
>
> So unless I cancel merges, I get the - to me - acceptable sequence

How do you cancel the merge? 

> `merge, resolve -m, commit`. The thing that bothers me (as discussed
> in another thread), is that I have to remember the -m, because
> otherwise it clobbers my already resolved file. I think it would be
> far better to have `hg resolve` say I resolved and `hg resolve
> --again` retry resolving.

I think that would solve the problem for me, too. 

Best wishes, 
Arne

-- 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/20081215/ef21bee0/attachment.pgp