diff -r f680a1bd679b -r 4a4c7f6a5912 mercurial/patch.py --- a/mercurial/patch.py Mon Mar 23 13:12:03 2009 +0100 +++ b/mercurial/patch.py Mon Mar 23 13:12:07 2009 +0100 @@ -8,8 +8,8 @@ from i18n import _ from node import hex, nullid, short -import base85, cmdutil, mdiff, util, revlog, diffhelpers, copies -import cStringIO, email.Parser, os, re, errno, math +import base85, cmdutil, mdiff, util, diffhelpers, copies +import cStringIO, email.Parser, os, re, math import sys, tempfile, zlib gitre = re.compile('diff --git a/(.*) b/(.*)')