equal
deleted
inserted
replaced
425 else: |
425 else: |
426 a = ma[f] |
426 a = ma[f] |
427 fla = ma.flags(f) |
427 fla = ma.flags(f) |
428 nol = 'l' not in fl1 + fl2 + fla |
428 nol = 'l' not in fl1 + fl2 + fla |
429 if n2 == a and fl2 == fla: |
429 if n2 == a and fl2 == fla: |
430 actions['k'].append((f, (), "keep")) # remote unchanged |
430 actions['k'].append((f, (), "remote unchanged")) |
431 elif n1 == a and fl1 == fla: # local unchanged - use remote |
431 elif n1 == a and fl1 == fla: # local unchanged - use remote |
432 if n1 == n2: # optimization: keep local content |
432 if n1 == n2: # optimization: keep local content |
433 actions['e'].append((f, (fl2,), "update permissions")) |
433 actions['e'].append((f, (fl2,), "update permissions")) |
434 else: |
434 else: |
435 actions['g'].append((f, (fl2,), "remote is newer")) |
435 actions['g'].append((f, (fl2,), "remote is newer")) |