Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 14406:c97c10a1b4bc
applyupdates: audit merged files
protects changing flags on merged files (util.setflags call on line 341)
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Sun, 22 May 2011 11:03:15 +0200 |
| parents | f2295a829f47 |
| children | cc8c09855d19 |
comparison
equal
deleted
inserted
replaced
| 14405:f2295a829f47 | 14406:c97c10a1b4bc |
|---|---|
| 327 elif m == "m": # merge | 327 elif m == "m": # merge |
| 328 if f == '.hgsubstate': # subrepo states need updating | 328 if f == '.hgsubstate': # subrepo states need updating |
| 329 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite) | 329 subrepo.submerge(repo, wctx, mctx, wctx.ancestor(mctx), overwrite) |
| 330 continue | 330 continue |
| 331 f2, fd, flags, move = a[2:] | 331 f2, fd, flags, move = a[2:] |
| 332 repo.wopener.audit(fd) | |
| 332 r = ms.resolve(fd, wctx, mctx) | 333 r = ms.resolve(fd, wctx, mctx) |
| 333 if r is not None and r > 0: | 334 if r is not None and r > 0: |
| 334 unresolved += 1 | 335 unresolved += 1 |
| 335 else: | 336 else: |
| 336 if r is None: | 337 if r is None: |