Merge with crew-stable

Merge with crew-stable

--- a/hgext/convert/filemap.py	Fri Jan 04 13:56:31 2008 -0800
+++ b/hgext/convert/filemap.py	Fri Jan 04 23:43:49 2008 +0100
@@ -129,6 +129,12 @@
         self.children = {}
         self.seenchildren = {}
 
+    def before(self):
+        self.base.before()
+
+    def after(self):
+        self.base.after()
+
     def setrevmap(self, revmap):
         # rebuild our state to make things restartable
         #