Mercurial > hg-stable
changeset 16490:c8ee34917045 stable
update: fix "not rev" vs "rev is None"
| author | Patrick Mezard <patrick@mezard.eu> |
|---|---|
| date | Mon, 23 Apr 2012 12:09:54 +0200 |
| parents | cf137319c6cd |
| children | bfe89d65d651 |
| files | mercurial/commands.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py Sat Apr 21 08:24:10 2012 -0700 +++ b/mercurial/commands.py Mon Apr 23 12:09:54 2012 +0200 @@ -5664,7 +5664,7 @@ c = repo[None] if c.modified() or c.added() or c.removed(): raise util.Abort(_("uncommitted local changes")) - if not rev: + if rev is None: rev = repo[repo[None].branch()].rev() mergemod._checkunknown(repo, repo[None], repo[rev])