diff mercurial/commands.py @ 5125:90be02035993

merge with crew-stable
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 06 Aug 2007 20:31:15 +0200
parents d5126a0172ba 73fdc8bd3ed8
children c80af96943aa
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Aug 06 10:57:51 2007 +0200
+++ b/mercurial/commands.py	Mon Aug 06 20:31:15 2007 +0200
@@ -2012,7 +2012,7 @@
     if modheads == 0:
         return
     if optupdate:
-        if modheads == 1:
+        if modheads <= 1:
             return hg.update(repo, None)
         else:
             ui.status(_("not updating, since new heads added\n"))