hgext/evolve.py
changeset 1117 98f4e356a431
parent 1116 d4977b04ef98
parent 1115 cc19b6400dae
child 1118 fbc400c1b022
--- a/hgext/evolve.py	Tue Sep 30 10:27:11 2014 -0500
+++ b/hgext/evolve.py	Thu Oct 02 14:16:32 2014 -0500
@@ -884,7 +884,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: