Show More
@@ -45,7 +45,8 b' class ImergeStateFile(object):' | |||||
45 | if self.im.repo.dirstate.parents()[0] != p1: |
|
45 | if self.im.repo.dirstate.parents()[0] != p1: | |
46 | hg.clean(self.im.repo, self.im.parents[0].node()) |
|
46 | hg.clean(self.im.repo, self.im.parents[0].node()) | |
47 | self.im.start(p2) |
|
47 | self.im.start(p2) | |
48 | tf.extractall(self.im.repo.root) |
|
48 | for tarinfo in tf: | |
|
49 | tf.extract(tarinfo, self.im.repo.root) | |||
49 | self.im.load() |
|
50 | self.im.load() | |
50 |
|
51 | |||
51 | class Imerge(object): |
|
52 | class Imerge(object): |
General Comments 0
You need to be logged in to leave comments.
Login now