# HG changeset patch # User Durham Goode # Date 1498681877 25200 # Node ID 07c38eee3954de62ba9fdefe673bc88719411add # Parent 6d0fe7ce9898aa0ef52a8c436047f9c3895b4092 obsolete: support obsolete.isenabled obsolete._enabled is the old deprecated way of checking if obsolete markers is on. Instead we should be using obsolete.isenabled() to check if individual features are on. diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -207,7 +207,8 @@ def push(repo, dest, force, revs): old_encoding = util.swap_out_encoding() try: - hasobsolete = obsolete._enabled + hasobsolete = (obsolete._enabled or + obsolete.isenabled(repo, obsolete.createmarkersopt)) except: hasobsolete = False