equal
deleted
inserted
replaced
418 # will be checked once we know what all the deleted files are. |
418 # will be checked once we know what all the deleted files are. |
419 remoteconflicts.add(f) |
419 remoteconflicts.add(f) |
420 # Track the names of all deleted files. |
420 # Track the names of all deleted files. |
421 for f in mresult.files((mergestatemod.ACTION_REMOVE,)): |
421 for f in mresult.files((mergestatemod.ACTION_REMOVE,)): |
422 deletedfiles.add(f) |
422 deletedfiles.add(f) |
423 for (f, args, msg) in mresult.getactions((mergestatemod.ACTION_MERGE,)): |
423 for f, args, msg in mresult.getactions((mergestatemod.ACTION_MERGE,)): |
424 f1, f2, fa, move, anc = args |
424 f1, f2, fa, move, anc = args |
425 if move: |
425 if move: |
426 deletedfiles.add(f1) |
426 deletedfiles.add(f1) |
427 for (f, args, msg) in mresult.getactions( |
427 for f, args, msg in mresult.getactions( |
428 (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,) |
428 (mergestatemod.ACTION_DIR_RENAME_MOVE_LOCAL,) |
429 ): |
429 ): |
430 f2, flags = args |
430 f2, flags = args |
431 deletedfiles.add(f2) |
431 deletedfiles.add(f2) |
432 |
432 |