# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1186056240 -7200
# Node ID 56d48aed1f6979e24f1fb668019c8881bc4fbb20
# Parent  ec70fd08e16c531f4ea6fbef8ff78970819f1247
imerge: tarfile.extractall is only available in python2.5

diff --git a/hgext/imerge.py b/hgext/imerge.py
--- a/hgext/imerge.py
+++ b/hgext/imerge.py
@@ -45,7 +45,8 @@ class ImergeStateFile(object):
         if self.im.repo.dirstate.parents()[0] != p1:
             hg.clean(self.im.repo, self.im.parents[0].node())
         self.im.start(p2)
-        tf.extractall(self.im.repo.root)
+        for tarinfo in tf:
+            tf.extract(tarinfo, self.im.repo.root)
         self.im.load()
 
 class Imerge(object):