--- a/mercurial/commands.py Sun Jul 05 11:05:31 2009 +0200
+++ b/mercurial/commands.py Sun Jul 05 11:06:09 2009 +0200
@@ -8,9 +8,9 @@
from node import hex, nullid, nullrev, short
from lock import release
from i18n import _, gettext
-import os, re, sys, subprocess, difflib, time
+import os, re, sys, subprocess, difflib, time, tempfile
import hg, util, revlog, bundlerepo, extensions, copies, context, error
-import patch, help, mdiff, tempfile, url, encoding
+import patch, help, mdiff, url, encoding
import archival, changegroup, cmdutil, sshserver, hbisect
from hgweb import server
import merge as merge_
--- a/mercurial/match.py Sun Jul 05 11:05:31 2009 +0200
+++ b/mercurial/match.py Sun Jul 05 11:06:09 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 util, re
+import re
+import util
class match(object):
def __init__(self, root, cwd, patterns, include=[], exclude=[],