# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1412277392 18000
# Node ID 98f4e356a431690dff7cfb9a8f3476b065b5f6b5
# Parent  d4977b04ef983c9f515a5f2283a86858eeb6d025# Parent  cc19b6400dae8a333980f6961df7cb1e86a93655
merge with stable

diff -r d4977b04ef98 -r 98f4e356a431 hgext/evolve.py
--- 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: