--- a/mercurial/cmdutil.py	Thu May 07 15:08:25 2009 +0300
+++ b/mercurial/cmdutil.py	Tue Apr 28 17:40:46 2009 +0200
@@ -7,8 +7,8 @@
 
 from node import hex, nullid, nullrev, short
 from i18n import _
-import os, sys, bisect, stat, encoding
-import mdiff, bdiff, util, templater, templatefilters, patch, errno, error
+import os, sys, bisect, stat, errno
+import mdiff, bdiff, util, templater, templatefilters, patch, error, encoding
 import match as _match
 
 revrangesep = ':'