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