[PATCH] merge: improve conflict markers by pointing to introrev

Yuya Nishihara yuya at tcha.org
Mon Mar 7 08:22:14 EST 2016


On Fri, 4 Mar 2016 08:31:40 -0800, Simon Farnsworth wrote:
> # HG changeset patch
> # User Simon Farnsworth <simonfar at fb.com>
> # Date 1457034054 0
> #      Thu Mar 03 19:40:54 2016 +0000
> # Node ID f9c8bf605e5b96530f6a4636c78f9c444767c445
> # Parent  9d6c19c8413a039aff8399d6b1db573cb6610fab
> merge: improve conflict markers by pointing to introrev
> 
> If you're working in a fast moving repository, the nodes chosen for conflict
> markers are apparently nonsensical - they're the revisions you're actually
> merging, even if the file in conflict did not change in those revisions.
> 
> Change the conflict markers to find the introrev for local and other, and
> use that as the node instead. This means that the conflict markers now point
> to the commits in which the conflicting file was last changed.

The default conflict marker includes {tags} and {bookmarks}. I don't think
they should be changed to the introrev. Perhaps we'll need new template keyword
for the introrev.


More information about the Mercurial-devel mailing list