Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
import: fix the "is None" check for the Node stable
authorPierre-Yves David <pierre-yves.david@fb.com>
Tue, 30 Sep 2014 10:27:54 -0500
branchstable
changeset 1115 cc19b6400dae
parent 1110 875e671c3cd8
child 1117 98f4e356a431
child 1146 3de3d85069fd
child 1154 937554e8c6cd
import: fix the "is None" check for the Node We are checking the wrong variable.
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- 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:
evolve