equal
deleted
inserted
replaced
1286 repo.ui.debug(" %s: %s -> e\n" % (f, msg)) |
1286 repo.ui.debug(" %s: %s -> e\n" % (f, msg)) |
1287 z += 1 |
1287 z += 1 |
1288 progress(_updating, z, item=f, total=numupdates, unit=_files) |
1288 progress(_updating, z, item=f, total=numupdates, unit=_files) |
1289 flags, = args |
1289 flags, = args |
1290 audit(f) |
1290 audit(f) |
1291 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
1291 repo.wvfs.setflags(f, 'l' in flags, 'x' in flags) |
1292 updated += 1 |
1292 updated += 1 |
1293 |
1293 |
1294 # the ordering is important here -- ms.mergedriver will raise if the merge |
1294 # the ordering is important here -- ms.mergedriver will raise if the merge |
1295 # driver has changed, and we want to be able to bypass it when overwrite is |
1295 # driver has changed, and we want to be able to bypass it when overwrite is |
1296 # True |
1296 # True |