Mercurial > public > mercurial-scm > hg-stable
diff mercurial/commands.py @ 41130:074c72a38423
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 07 Jan 2019 19:03:23 -0500 |
parents | 5967995c32bb fbd5e2f0bba7 |
children | 08dd462ea782 |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Jan 07 15:25:41 2019 -0800 +++ b/mercurial/commands.py Mon Jan 07 19:03:23 2019 -0500 @@ -6098,7 +6098,7 @@ brev = rev if rev: repo = scmutil.unhidehashlikerevs(repo, [rev], 'nowarn') - ctx = scmutil.revsingle(repo, rev, rev) + ctx = scmutil.revsingle(repo, rev, default=None) rev = ctx.rev() hidden = ctx.hidden() overrides = {('ui', 'forcemerge'): opts.get(r'tool', '')}