equal
deleted
inserted
replaced
380 except OSError, inst: |
380 except OSError, inst: |
381 repo.ui.warn(_("update failed to remove %s: %s!\n") % |
381 repo.ui.warn(_("update failed to remove %s: %s!\n") % |
382 (f, inst.strerror)) |
382 (f, inst.strerror)) |
383 removed += 1 |
383 removed += 1 |
384 elif m == "m": # merge |
384 elif m == "m": # merge |
|
385 f2, fd, move = a[2:] |
385 if fd == '.hgsubstate': # subrepo states need updating |
386 if fd == '.hgsubstate': # subrepo states need updating |
386 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), |
387 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), |
387 overwrite) |
388 overwrite) |
388 continue |
389 continue |
389 f2, fd, move = a[2:] |
|
390 audit(fd) |
390 audit(fd) |
391 r = ms.resolve(fd, wctx, mctx) |
391 r = ms.resolve(fd, wctx, mctx) |
392 if r is not None and r > 0: |
392 if r is not None and r > 0: |
393 unresolved += 1 |
393 unresolved += 1 |
394 else: |
394 else: |