equal
deleted
inserted
replaced
182 p1 = node |
182 p1 = node |
183 continue |
183 continue |
184 if pulls: |
184 if pulls: |
185 if source != repo: |
185 if source != repo: |
186 exchange.pull(repo, source.peer(), heads=pulls) |
186 exchange.pull(repo, source.peer(), heads=pulls) |
187 merge.update(repo, pulls[-1], False, False) |
187 merge.update(repo, pulls[-1], branchmerge=False, |
|
188 force=False) |
188 p1, p2 = repo.dirstate.parents() |
189 p1, p2 = repo.dirstate.parents() |
189 pulls = [] |
190 pulls = [] |
190 |
191 |
191 domerge = False |
192 domerge = False |
192 if node in merges: |
193 if node in merges: |
247 if patchfile: |
248 if patchfile: |
248 os.unlink(patchfile) |
249 os.unlink(patchfile) |
249 tr.close() |
250 tr.close() |
250 if pulls: |
251 if pulls: |
251 exchange.pull(repo, source.peer(), heads=pulls) |
252 exchange.pull(repo, source.peer(), heads=pulls) |
252 merge.update(repo, pulls[-1], False, False) |
253 merge.update(repo, pulls[-1], branchmerge=False, force=False) |
253 finally: |
254 finally: |
254 self.saveseries(revmap, merges) |
255 self.saveseries(revmap, merges) |
255 self.transplants.write() |
256 self.transplants.write() |
256 if tr: |
257 if tr: |
257 tr.release() |
258 tr.release() |