Mercurial > hg

diff mercurial/commands.py @ 16490:c8ee34917045 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: fix "not rev" vs "rev is None"
author Patrick Mezard <patrick@mezard.eu>
date Mon, 23 Apr 2012 12:09:54 +0200
parents 7adc521259d4
children bfe89d65d651
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])