diff -r e0eb03bfa5af -r b87a50b7125c mercurial/encoding.py
--- a/mercurial/encoding.py	Thu May 07 15:08:25 2009 +0300
+++ b/mercurial/encoding.py	Tue Apr 28 17:40:46 2009 +0200
@@ -5,7 +5,8 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2, incorporated herein by reference.
 
-import sys, unicodedata, locale, os, error
+import error
+import sys, unicodedata, locale, os
 
 _encodingfixup = {'646': 'ascii', 'ANSI_X3.4-1968': 'ascii'}