Mercurial > evolve
diff hgext/evolve.py @ 1054:93e920feff5e stable
import: compare binary node with binary node when using --obsolete
hex(N) != N
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Thu, 14 Aug 2014 15:14:18 -0700 |
parents | ac47c2f774a8 |
children | cfe1b9d3e5d9 |
line wrap: on
line diff
--- a/hgext/evolve.py Sun Aug 10 23:58:31 2014 -0700 +++ b/hgext/evolve.py Thu Aug 14 15:14:18 2014 -0700 @@ -933,6 +933,7 @@ def tryimportone(orig, ui, repo, hunk, parents, opts, *args, **kwargs): extracted = patch.extract(ui, hunk) expected = extracted[5] + expected = node.bin(expected) oldextract = patch.extract try: patch.extract = lambda ui, hunk: extracted @@ -944,7 +945,7 @@ tr = repo.transaction('import-obs') try: metadata = {'user': ui.username()} - repo.obsstore.create(tr, node.bin(expected), (created,), + repo.obsstore.create(tr, expected, (created,), metadata=metadata) tr.close() finally: