Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 4381:f4af7960d578

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bad reference to RepoError in import command
author Joel Rosdahl <joel@rosdahl.net>
date Sat, 28 Apr 2007 16:28:54 +0200
parents de612b5f8d59
children 28054fc34923
line wrap: on
line diff
--- 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 = {}