[PATCH] Fix bad reference to RepoError in import command

[Joel Rosdahl]

Here's a patch that fixes a bad reference to RepoError in the import
command. I don't remember how I trigged the bug, though.

# HG changeset patch
# User Joel Rosdahl <joel at rosdahl.net>
# Date 1177770534 -7200
# Node ID e905aa30b6a085ec533198873732d400092f5dd4
# Parent  80c7fa620a4dbdfabd8f92e837d911e04cfb61fb
Fix bad reference to RepoError in import command

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -1550,7 +1550,7 @@ def import_(ui, repo, patch1, *patches, 
                     p2 = repo.lookup(p2)
                     if p1 == wp[0].node():
                         repo.dirstate.setparents(p1, p2)
-                except RepoError:
+                except hg.RepoError:
                     pass
 
             files = {}

-- 
Joel Rosdahl <joel at rosdahl.net>
Key BB845E97; fingerprint 9F4B D780 6EF4 5700 778D  8B22 0064 F9FF BB84 5E97