Mercurial > evolve
changeset 1115:cc19b6400dae stable
import: fix the "is None" check for the Node
We are checking the wrong variable.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 30 Sep 2014 10:27:54 -0500 |
| parents | 875e671c3cd8 |
| children | 98f4e356a431 3de3d85069fd 937554e8c6cd |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: