equal
deleted
inserted
replaced
43 p1 = self.im.parents[0].node() |
43 p1 = self.im.parents[0].node() |
44 p2 = self.im.parents[1].node() |
44 p2 = self.im.parents[1].node() |
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): |
52 def __init__(self, ui, repo): |
53 def __init__(self, ui, repo): |
53 self.ui = ui |
54 self.ui = ui |