Mercurial > hg > mercurial-crew-with-dirclash

changeset 5055:56d48aed1f69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imerge: tarfile.extractall is only available in python2.5
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 02 Aug 2007 14:04:00 +0200
parents ec70fd08e16c
children 34a54cc5df1b
files hgext/imerge.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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):