diff -r 6aece8fc7f3c -r dbe2bdd5e488 mercurial/hg.py --- a/mercurial/hg.py Tue Aug 18 08:49:41 2009 +0200 +++ b/mercurial/hg.py Tue Sep 08 19:46:20 2009 -0300 @@ -137,10 +137,12 @@ if update is not True: checkout = update for test in (checkout, 'default', 'tip'): + if test is None: + continue try: uprev = r.lookup(test) break - except LookupError: + except error.RepoLookupError: continue _update(r, uprev) @@ -309,10 +311,12 @@ if update is not True: checkout = update for test in (checkout, 'default', 'tip'): + if test is None: + continue try: uprev = dest_repo.lookup(test) break - except: + except error.RepoLookupError: continue _update(dest_repo, uprev)