equal
deleted
inserted
replaced
399 # local is newer, not overwrite, check mode bits |
399 # local is newer, not overwrite, check mode bits |
400 elif fmerge(f) != m1.flags(f): |
400 elif fmerge(f) != m1.flags(f): |
401 act("update permissions", "e", f, m2.flags(f)) |
401 act("update permissions", "e", f, m2.flags(f)) |
402 # contents same, check mode bits |
402 # contents same, check mode bits |
403 elif m1.flags(f) != m2.flags(f): |
403 elif m1.flags(f) != m2.flags(f): |
404 if overwrite or fmerge(f) != m1.flags(f): |
404 # are we clobbering? |
|
405 # is remote's version newer? |
|
406 # or are we going back? |
|
407 if overwrite or fmerge(f) != m1.flags(f) or backwards: |
405 act("update permissions", "e", f, m2.flags(f)) |
408 act("update permissions", "e", f, m2.flags(f)) |
406 elif f in copied: |
409 elif f in copied: |
407 continue |
410 continue |
408 elif f in copy: |
411 elif f in copy: |
409 f2 = copy[f] |
412 f2 = copy[f] |