[PATCH 2 of 3 ctx-cleanup] merge: wctx.rev() is never not None

Sean Farley sean at farley.io
Thu Jun 1 14:30:53 EDT 2017


Augie Fackler <raf at durin42.com> writes:

> On Wed, May 31, 2017 at 05:22:07PM -0700, Sean Farley wrote:
>> # HG changeset patch
>> # User Sean Farley <sean at farley.io>
>> # Date 1494536162 25200
>> #      Thu May 11 13:56:02 2017 -0700
>> # Branch wctxds
>> # Node ID 6cdb17d89848a1bdb0fbcac24fe8c8322bb0bb02
>> # Parent  9879720e90cf13e445d17fc22f53c071a22322d9
>> merge: wctx.rev() is never not None
>
> This broke several tests. test-convert-hg-startrev.t was the one I
> used to bisect. Dropped for now.

Eek, sorry about that! I'll investigate and try to fixup (but might fold
it into my other merge.py work).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <http://www.mercurial-scm.org/pipermail/mercurial-devel/attachments/20170601/98bb8109/attachment.sig>


More information about the Mercurial-devel mailing list