Show More
@@ -1039,8 +1039,7 b' def calculateupdates(repo, wctx, mctx, a' | |||||
1039 | for f in dms: |
|
1039 | for f in dms: | |
1040 | dm, (f0, flags), msg = actions[f] |
|
1040 | dm, (f0, flags), msg = actions[f] | |
1041 | assert dm == 'dm', dm |
|
1041 | assert dm == 'dm', dm | |
1042 |
|
|
1042 | if f0 in actions and actions[f0][0] == 'r': | |
1043 | if m == 'r': |
|
|||
1044 | # We have one bid for removing a file and another for moving it. |
|
1043 | # We have one bid for removing a file and another for moving it. | |
1045 | # These two could be merged as first move and then delete ... |
|
1044 | # These two could be merged as first move and then delete ... | |
1046 | # but instead drop moving and just delete. |
|
1045 | # but instead drop moving and just delete. |
General Comments 0
You need to be logged in to leave comments.
Login now