equal
deleted
inserted
replaced
131 dcopies = repo.dirstate.copies() |
131 dcopies = repo.dirstate.copies() |
132 copy = {} |
132 copy = {} |
133 match = {} |
133 match = {} |
134 u1 = nonoverlap(m1, m2, ma) |
134 u1 = nonoverlap(m1, m2, ma) |
135 u2 = nonoverlap(m2, m1, ma) |
135 u2 = nonoverlap(m2, m1, ma) |
136 ctx = util.cachefunc(lambda f,n: repo.filectx(f, fileid=n[:20])) |
136 ctx = util.cachefunc(lambda f, n: repo.filectx(f, fileid=n[:20])) |
137 |
137 |
138 def checkpair(c, f2, man): |
138 def checkpair(c, f2, man): |
139 ''' check if an apparent pair actually matches ''' |
139 ''' check if an apparent pair actually matches ''' |
140 c2 = ctx(f2, man[f2]) |
140 c2 = ctx(f2, man[f2]) |
141 ca = c.ancestor(c2) |
141 ca = c.ancestor(c2) |
283 util.unlink(repo.wjoin(f)) |
283 util.unlink(repo.wjoin(f)) |
284 except OSError, inst: |
284 except OSError, inst: |
285 if inst.errno != errno.ENOENT: |
285 if inst.errno != errno.ENOENT: |
286 repo.ui.warn(_("update failed to remove %s: %s!\n") % |
286 repo.ui.warn(_("update failed to remove %s: %s!\n") % |
287 (f, inst.strerror)) |
287 (f, inst.strerror)) |
288 removed +=1 |
288 removed += 1 |
289 elif m == "m": # merge |
289 elif m == "m": # merge |
290 f2, fd, flag, move = a[2:] |
290 f2, fd, flag, move = a[2:] |
291 r = filemerge(repo, f, f2, wctx, mctx) |
291 r = filemerge(repo, f, f2, wctx, mctx) |
292 if r > 0: |
292 if r > 0: |
293 unresolved += 1 |
293 unresolved += 1 |