equal
deleted
inserted
replaced
1584 for f, (m, args, msg) in actionbyfile.iteritems(): |
1584 for f, (m, args, msg) in actionbyfile.iteritems(): |
1585 if m not in actions: |
1585 if m not in actions: |
1586 actions[m] = [] |
1586 actions[m] = [] |
1587 actions[m].append((f, args, msg)) |
1587 actions[m].append((f, args, msg)) |
1588 |
1588 |
1589 if not util.checkcase(repo.path): |
1589 if not util.fscasesensitive(repo.path): |
1590 # check collision between files only in p2 for clean update |
1590 # check collision between files only in p2 for clean update |
1591 if (not branchmerge and |
1591 if (not branchmerge and |
1592 (force or not wc.dirty(missing=True, branch=False))): |
1592 (force or not wc.dirty(missing=True, branch=False))): |
1593 _checkcollision(repo, p2.manifest(), None) |
1593 _checkcollision(repo, p2.manifest(), None) |
1594 else: |
1594 else: |