# HG changeset patch # User Pierre-Yves David # Date 1408054458 25200 # Node ID 93e920feff5ed2b523636ad31a2f9720b7b7efd3 # Parent bfa9d535f436048c38f82031fe02da560197ce56 import: compare binary node with binary node when using --obsolete hex(N) != N diff --git a/hgext/evolve.py b/hgext/evolve.py --- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -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: