equal
deleted
inserted
replaced
334 else: |
334 else: |
335 if r is None: |
335 if r is None: |
336 updated += 1 |
336 updated += 1 |
337 else: |
337 else: |
338 merged += 1 |
338 merged += 1 |
339 util.set_flags(repo.wjoin(fd), 'l' in flags, 'x' in flags) |
339 util.setflags(repo.wjoin(fd), 'l' in flags, 'x' in flags) |
340 if (move and repo.dirstate.normalize(fd) != f |
340 if (move and repo.dirstate.normalize(fd) != f |
341 and os.path.lexists(repo.wjoin(f))): |
341 and os.path.lexists(repo.wjoin(f))): |
342 repo.ui.debug("removing %s\n" % f) |
342 repo.ui.debug("removing %s\n" % f) |
343 os.unlink(repo.wjoin(f)) |
343 os.unlink(repo.wjoin(f)) |
344 elif m == "g": # get |
344 elif m == "g": # get |
368 "multiple times to:\n") % f) |
368 "multiple times to:\n") % f) |
369 for nf in fl: |
369 for nf in fl: |
370 repo.ui.warn(" %s\n" % nf) |
370 repo.ui.warn(" %s\n" % nf) |
371 elif m == "e": # exec |
371 elif m == "e": # exec |
372 flags = a[2] |
372 flags = a[2] |
373 util.set_flags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
373 util.setflags(repo.wjoin(f), 'l' in flags, 'x' in flags) |
374 ms.commit() |
374 ms.commit() |
375 u.progress(_('updating'), None, total=numupdates, unit=_('files')) |
375 u.progress(_('updating'), None, total=numupdates, unit=_('files')) |
376 |
376 |
377 return updated, merged, removed, unresolved |
377 return updated, merged, removed, unresolved |
378 |
378 |