changeset 50925 | d718eddf01d9 |
parent 50600 | d1502345f89c |
child 50926 | 18c8c18993f0 |
--- a/mercurial/strip.py Thu Dec 08 15:33:19 2022 +0100 +++ b/mercurial/strip.py Thu Aug 31 23:56:15 2023 +0200 @@ -12,7 +12,6 @@ registrar, repair, scmutil, - util, ) release = lockmod.release @@ -36,7 +35,7 @@ currentbranch = repo[None].branch() if ( - util.safehasattr(repo, 'mq') + hasattr(repo, 'mq') and p2 != repo.nullid and p2 in [x.node for x in repo.mq.applied] ):