changeset 34968 | 3649c3f2cd90 |
parent 34928 | 362096cfdb1f |
child 34996 | 602c168c0207 |
--- a/mercurial/cmdutil.py Fri Nov 03 10:32:38 2017 -0500 +++ b/mercurial/cmdutil.py Fri Nov 03 14:47:37 2017 +0100 @@ -3790,9 +3790,8 @@ operation = 'discard' reversehunks = True if node != parent: - operation = 'revert' - reversehunks = repo.ui.configbool('experimental', - 'revertalternateinteractivemode') + operation = 'apply' + reversehunks = False if reversehunks: diff = patch.diff(repo, ctx.node(), None, m, opts=diffopts) else: