--- a/mercurial/commands.py Tue Apr 24 18:43:18 2007 -0700 +++ b/mercurial/commands.py Sat Apr 28 16:28:54 2007 +0200 @@ -1550,7 +1550,7 @@ p2 = repo.lookup(p2) if p1 == wp[0].node(): repo.dirstate.setparents(p1, p2) - except RepoError: + except hg.RepoError: pass files = {}