branch | stable |
changeset 1115 | cc19b6400dae |
parent 1109 | 212f24013455 |
child 1117 | 98f4e356a431 |
--- 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: