[PATCH 2 of 2] revset: new predicates to find key merge revisions
simonfar at fb.com
Mon Mar 7 10:35:42 EST 2016
On 07/03/2016, 15:32, "Simon Farnsworth" <simonfar at fb.com> wrote:
>On 07/03/2016, 14:59, "Yuya Nishihara" <youjah at gmail.com on behalf of yuya at tcha.org> wrote:
>>On Fri, 4 Mar 2016 12:12:05 -0800, Simon Farnsworth wrote:
>>> + s = set()
>>> + for f in files:
>>> + if t == "ancestor":
>>> + s.add(ms.ancestorchangectx(f).rev())
>>> + elif t == "local":
>>> + s.add(ms.localfilectx(f).introrev())
>>> + elif t == "other":
>>> + s.add(ms.otherfilectx(f).introrev())
>>Nit: "other" and "ancestor" raised exception with V1 mergestate.
>Will fix and resubmit. Is there an easy way to get a V1 mergestate for a test case?
Found the answer myself - erase the v2 mergestate, as both get written together.
More information about the Mercurial-devel