Mercurial > hg
comparison mercurial/merge.py @ 16683:525fdb738975
cleanup: eradicate long lines
| author | Brodie Rao <brodie@sf.io> |
|---|---|
| date | Sat, 12 May 2012 15:54:54 +0200 |
| parents | ebf6d38c9063 |
| children | d1afbf03e69a |
comparison
equal
deleted
inserted
replaced
| 16676:654b9e1966f7 | 16683:525fdb738975 |
|---|---|
| 361 repo.ui.warn(_("update failed to remove %s: %s!\n") % | 361 repo.ui.warn(_("update failed to remove %s: %s!\n") % |
| 362 (f, inst.strerror)) | 362 (f, inst.strerror)) |
| 363 removed += 1 | 363 removed += 1 |
| 364 elif m == "m": # merge | 364 elif m == "m": # merge |
| 365 if f == '.hgsubstate': # subrepo states need updating | 365 if f == '.hgsubstate': # subrepo states need updating |
| 366 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite) | 366 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), |
| 367 overwrite) | |
| 367 continue | 368 continue |
| 368 f2, fd, flags, move = a[2:] | 369 f2, fd, flags, move = a[2:] |
| 369 repo.wopener.audit(fd) | 370 repo.wopener.audit(fd) |
| 370 r = ms.resolve(fd, wctx, mctx) | 371 r = ms.resolve(fd, wctx, mctx) |
| 371 if r is not None and r > 0: | 372 if r is not None and r > 0: |