--- a/mercurial/discovery.py Wed May 04 08:21:50 2011 -0500
+++ b/mercurial/discovery.py Wed May 04 19:27:55 2011 +0200
@@ -7,7 +7,7 @@
from node import nullid, short
from i18n import _
-import util, error, setdiscovery, treediscovery
+import util, setdiscovery, treediscovery
def findcommonincoming(repo, remote, heads=None, force=False):
"""Return a tuple (common, anyincoming, heads) used to identify the common
--- a/mercurial/localrepo.py Wed May 04 08:21:50 2011 -0500
+++ b/mercurial/localrepo.py Wed May 04 19:27:55 2011 +0200
@@ -661,7 +661,7 @@
if 'l' in flags:
self.wopener.symlink(data, filename)
else:
- fp = self.wopener.write(filename, data)
+ self.wopener.write(filename, data)
if 'x' in flags:
util.set_flags(self.wjoin(filename), False, True)