equal
deleted
inserted
replaced
150 p1 = node |
150 p1 = node |
151 continue |
151 continue |
152 if pulls: |
152 if pulls: |
153 if source != repo: |
153 if source != repo: |
154 exchange.pull(repo, source.peer(), heads=pulls) |
154 exchange.pull(repo, source.peer(), heads=pulls) |
155 merge.update(repo, pulls[-1], False, False, None) |
155 merge.update(repo, pulls[-1], False, False) |
156 p1, p2 = repo.dirstate.parents() |
156 p1, p2 = repo.dirstate.parents() |
157 pulls = [] |
157 pulls = [] |
158 |
158 |
159 domerge = False |
159 domerge = False |
160 if node in merges: |
160 if node in merges: |
214 if patchfile: |
214 if patchfile: |
215 os.unlink(patchfile) |
215 os.unlink(patchfile) |
216 tr.close() |
216 tr.close() |
217 if pulls: |
217 if pulls: |
218 exchange.pull(repo, source.peer(), heads=pulls) |
218 exchange.pull(repo, source.peer(), heads=pulls) |
219 merge.update(repo, pulls[-1], False, False, None) |
219 merge.update(repo, pulls[-1], False, False) |
220 finally: |
220 finally: |
221 self.saveseries(revmap, merges) |
221 self.saveseries(revmap, merges) |
222 self.transplants.write() |
222 self.transplants.write() |
223 if tr: |
223 if tr: |
224 tr.release() |
224 tr.release() |