Mercurial > hg
comparison mercurial/merge.py @ 18334:44bda93df90e
merge: changing the mode of a file is also an update
It was a change in the file system that wasn't reported in the summaries.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Thu, 10 Jan 2013 00:44:23 +0100 |
| parents | f6f23ecafc9b |
| children | 435909bf0257 |
comparison
equal
deleted
inserted
replaced
| 18333:f6f23ecafc9b | 18334:44bda93df90e |
|---|---|
| 438 repo.ui.warn(" %s\n" % nf) | 438 repo.ui.warn(" %s\n" % nf) |
| 439 elif m == "e": # exec | 439 elif m == "e": # exec |
| 440 flags = a[2] | 440 flags = a[2] |
| 441 audit(f) | 441 audit(f) |
| 442 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) | 442 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
| 443 updated += 1 | |
| 443 ms.commit() | 444 ms.commit() |
| 444 repo.ui.progress(_('updating'), None, total=numupdates, unit=_('files')) | 445 repo.ui.progress(_('updating'), None, total=numupdates, unit=_('files')) |
| 445 | 446 |
| 446 return updated, merged, removed, unresolved | 447 return updated, merged, removed, unresolved |
| 447 | 448 |