Conflicts on .hgtags, but no revisions on chevron markers?

[Martin Geisler]

Matt Mackall <mpm at selenic.com> writes:

> On Tue, 2009-11-10 at 11:30 -0800, Clint Olsen wrote:
>> Hi:
>> 
>> I had a need to move a tag, and so I tried to push this back to the
>> parent and ran into conflicts on my pull, first. Anyway, the chevrons
>> were there, indicating the conflict, but without revision notes in
>> the chevrons, it's a bit of a mystery of how to resolve the conflict
>> w/o some indication of which block goes with which revision w/o
>> actually manually inspecting the parent to see what it had in
>> .hgtags. Did I do something wrong or is this just a missing feature?
>
> Yeah, we don't support that currently and you're the first person to
> ask for it. Internal merge conflict markers are the method of last
> resort, most of the world uses some sort of GUI merge tool.

I wouldn't say "most of the world" -- I use conflict markers too.

I find kdiff3 very confusing and I prefer to just edit the files. I've
only ever had small and easy conflicts, though.

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://selenic.com/pipermail/mercurial/attachments/20091110/5edefa27/attachment.pgp>