diff -r 7d86594cb829 -r 51afc979d88d hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Fri Jul 14 01:49:43 2017 +0200 +++ b/hgext3rd/topic/__init__.py Fri Jul 14 01:53:56 2017 +0200 @@ -615,7 +615,7 @@ # running. if repo.ui.hasconfig('experimental', 'topicrebase'): isrebase = True - if repo.ui.configbool('_internal', 'updating-to-t0'): + if repo.ui.configbool('_internal', 'keep-topic'): ist0 = True if ((not partial and not branchmerge) or isrebase) and not ist0: ot = repo.currenttopic @@ -640,7 +640,7 @@ thezeros = set(['t0', 'b0']) overrides = {} if node in thezeros or rev in thezeros: - overrides[('_internal', 'updating-to-t0')] = 'yes' + overrides[('_internal', 'keep-topic')] = 'yes' with repo.ui.configoverride(overrides, source='topic-extension'): return orig(ui, repo, node, rev, clean, date, check, merge, tool)