# HG changeset patch # User Pierre-Yves David # Date 1412090874 18000 # Node ID cc19b6400dae8a333980f6961df7cb1e86a93655 # Parent 875e671c3cd855fe2cd30815c037a3f2a20b16e3 import: fix the "is None" check for the Node We are checking the wrong variable. diff -r 875e671c3cd8 -r cc19b6400dae hgext/evolve.py --- a/hgext/evolve.py Tue Aug 12 21:02:34 2014 -0400 +++ b/hgext/evolve.py Tue Sep 30 10:27:54 2014 -0500 @@ -1011,7 +1011,7 @@ def tryimportone(orig, ui, repo, hunk, parents, opts, *args, **kwargs): extracted = patch.extract(ui, hunk) expected = extracted[5] - if extracted is not None: + if expected is not None: expected = node.bin(expected) oldextract = patch.extract try: