diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -338,6 +338,7 @@ test-obsolete-changeset-exchange.t test-obsolete-checkheads.t test-obsolete-distributed.t +test-obsolete-divergent.t test-obsolete-tag-cache.t test-pager.t test-parents.t diff --git a/tests/test-obsolete-divergent.t b/tests/test-obsolete-divergent.t --- a/tests/test-obsolete-divergent.t +++ b/tests/test-obsolete-divergent.t @@ -704,16 +704,16 @@ > from mercurial import registrar, scmutil > cmdtable = {} > command = registrar.command(cmdtable) - > @command('cleanup') + > @command(b'cleanup') > def cleanup(ui, repo): > def node(expr): > unfi = repo.unfiltered() > rev = unfi.revs(expr).first() > return unfi.changelog.node(rev) - > with repo.wlock(), repo.lock(), repo.transaction('delayedstrip'): - > mapping = {node('desc(B1)'): [node('desc(B3)')], - > node('desc(B3)'): [node('desc(B4)')]} - > scmutil.cleanupnodes(repo, mapping, 'test') + > with repo.wlock(), repo.lock(), repo.transaction(b'delayedstrip'): + > mapping = {node(b'desc(B1)'): [node(b'desc(B3)')], + > node(b'desc(B3)'): [node(b'desc(B4)')]} + > scmutil.cleanupnodes(repo, mapping, b'test') > EOF $ rm .hg/localtags