diff tests/test-convert-cvsnt-mergepoints.t @ 34345:05167447f90d

py3: return False early while checking whether None is a key in lazymanifest In this patch we returns False early if we are trying to check whether None is a key in lazymanifest. The reason I added a diff is that on Python 3, it goes into the lazy manifest code an returns a TypeError. I checked with Durham that whether None can be a possible key in lazymanifest and he said "no". So it's safe to have this if statement. This fixes `hg merge` on Python 3. Differential Revision: https://phab.mercurial-scm.org/D852
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 30 Sep 2017 05:22:22 +0530
parents 96529f81e2e9
children e5e5ee2b60e4
line wrap: on
line diff