equal
deleted
inserted
replaced
288 yield f |
288 yield f |
289 |
289 |
290 def _resolve(self, dfile, wctx, labels=None): |
290 def _resolve(self, dfile, wctx, labels=None): |
291 """rerun merge process for file path `dfile`""" |
291 """rerun merge process for file path `dfile`""" |
292 if self[dfile] == 'r': |
292 if self[dfile] == 'r': |
293 return 0 |
293 return True, 0 |
294 stateentry = self._state[dfile] |
294 stateentry = self._state[dfile] |
295 state, hash, lfile, afile, anode, ofile, onode, flags = stateentry |
295 state, hash, lfile, afile, anode, ofile, onode, flags = stateentry |
296 octx = self._repo[self._other] |
296 octx = self._repo[self._other] |
297 fcd = wctx[dfile] |
297 fcd = wctx[dfile] |
298 fco = octx[ofile] |
298 fco = octx[ofile] |
319 # no real conflict |
319 # no real conflict |
320 del self._state[dfile] |
320 del self._state[dfile] |
321 self._dirty = True |
321 self._dirty = True |
322 elif not r: |
322 elif not r: |
323 self.mark(dfile, 'r') |
323 self.mark(dfile, 'r') |
324 return r |
324 return complete, r |
325 |
325 |
326 def resolve(self, dfile, wctx, labels=None): |
326 def resolve(self, dfile, wctx, labels=None): |
327 """rerun merge process for file path `dfile`""" |
327 """rerun merge process for file path `dfile`""" |
328 return self._resolve(dfile, wctx, labels=labels) |
328 return self._resolve(dfile, wctx, labels=labels)[1] |
329 |
329 |
330 def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
330 def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
331 if f2 is None: |
331 if f2 is None: |
332 f2 = f |
332 f2 = f |
333 return (os.path.isfile(repo.wjoin(f)) |
333 return (os.path.isfile(repo.wjoin(f)) |