[PATCH 2 of 5] filemerge: indicate that local/other are p1/p2

Simon King simon at simonking.org.uk
Thu Mar 17 17:00:47 EDT 2016

> On 17 Mar 2016, at 16:02, Gregory Szorc <gregory.szorc at gmail.com> wrote:
> Something to watch out for with p1 and p2 is that Mercurial doesn't preserve parent order: it sorts the nodes and first is p1.
> I think this patch is referring to different parents, so it might be fine. Then again, it does expose p1 and p2 to the docs, so...

What exactly do you mean by this? I was always under the impression that during a merge, p1 was the revision that was checked out, and p2 was the revision specified in “hg merge” (and a quick test suggests that’s the case). Is it not guaranteed?


More information about the Mercurial-devel mailing list