equal
deleted
inserted
replaced
117 p1 = node |
117 p1 = node |
118 continue |
118 continue |
119 if pulls: |
119 if pulls: |
120 if source != repo: |
120 if source != repo: |
121 repo.pull(source, heads=pulls, lock=lock) |
121 repo.pull(source, heads=pulls, lock=lock) |
122 merge.update(repo, pulls[-1], wlock=wlock) |
122 merge.update(repo, pulls[-1], False, False, None, |
|
123 wlock=wlock) |
123 p1, p2 = repo.dirstate.parents() |
124 p1, p2 = repo.dirstate.parents() |
124 pulls = [] |
125 pulls = [] |
125 |
126 |
126 domerge = False |
127 domerge = False |
127 if node in merges: |
128 if node in merges: |
159 finally: |
160 finally: |
160 if patchfile: |
161 if patchfile: |
161 os.unlink(patchfile) |
162 os.unlink(patchfile) |
162 if pulls: |
163 if pulls: |
163 repo.pull(source, heads=pulls, lock=lock) |
164 repo.pull(source, heads=pulls, lock=lock) |
164 merge.update(repo, pulls[-1], wlock=wlock) |
165 merge.update(repo, pulls[-1], False, False, None, wlock=wlock) |
165 finally: |
166 finally: |
166 self.saveseries(revmap, merges) |
167 self.saveseries(revmap, merges) |
167 self.transplants.write() |
168 self.transplants.write() |
168 |
169 |
169 def filter(self, filter, changelog, patchfile): |
170 def filter(self, filter, changelog, patchfile): |