hg resolve quite cumbersome

[Peter Arrenbrecht]

On Sat, Dec 13, 2008 at 9:56 AM, Arne Babenhauserheide <arne_bab at web.de> wrote:
> 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"

This would mean Hg would be able to detect resolved merges. And - no -
I don't think detecting remaining conflict markers is a solution - it
is impossible in general (think binary files).

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

I would not appreciate this. When I commit, I want to use my tool of
choice. For instance, to set the commit message.

> 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"

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
`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.
-parren

>
>
> 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
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>