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

Clint Olsen clint.olsen at gmail.com
Tue Nov 10 13:30:39 CST 2009


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?

Thanks,

-Clint


More information about the Mercurial mailing list