Mercurial > evolve
changeset 1117:98f4e356a431
merge with stable
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 02 Oct 2014 14:16:32 -0500 |
| parents | d4977b04ef98 (current diff) cc19b6400dae (diff) |
| children | fbc400c1b022 |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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: