changeset 29283 | 14eee72c8d52 |
parent 29216 | ead25aa27a43 |
child 29326 | d48fc6f318a3 |
--- a/mercurial/cmdutil.py Tue Apr 05 01:35:58 2016 +0000 +++ b/mercurial/cmdutil.py Fri Jun 03 15:55:07 2016 +0200 @@ -3301,10 +3301,12 @@ else: diff = patch.diff(repo, None, ctx.node(), m, opts=diffopts) originalchunks = patch.parsepatch(diff) + operation = _('discard') if node == parent else _('revert') try: - chunks, opts = recordfilter(repo.ui, originalchunks) + chunks, opts = recordfilter(repo.ui, originalchunks, + operation=operation) if reversehunks: chunks = patch.reversehunks(chunks)