Show More
@@ -973,14 +973,14 b' def checkpathconflicts(repo, wctx, mctx,' | |||
|
973 | 973 | # Rename all local conflicting files that have not been deleted. |
|
974 | 974 | for p in localconflicts: |
|
975 | 975 | if p not in deletedfiles: |
|
976 |
ctxname = |
|
|
976 | ctxname = bytes(wctx).rstrip('+') | |
|
977 | 977 | pnew = util.safename(p, ctxname, wctx, set(actions.keys())) |
|
978 | 978 | actions[pnew] = ('pr', (p,), "local path conflict") |
|
979 | 979 | actions[p] = ('p', (pnew, 'l'), "path conflict") |
|
980 | 980 | |
|
981 | 981 | if remoteconflicts: |
|
982 | 982 | # Check if all files in the conflicting directories have been removed. |
|
983 |
ctxname = |
|
|
983 | ctxname = bytes(mctx).rstrip('+') | |
|
984 | 984 | for f, p in _filesindirs(repo, mf, remoteconflicts): |
|
985 | 985 | if f not in deletedfiles: |
|
986 | 986 | m, args, msg = actions[p] |
General Comments 0
You need to be logged in to leave comments.
Login now