Merge branch 'ld/git-p4-shelve-update-fix'
"git p4" failed to update a shelved change when there were moved files, which has been corrected. * ld/git-p4-shelve-update-fix: git-p4: handle update of moved/copied files when updating a shelve git-p4: add failing test for shelved CL update involving move/copy
This commit is contained in:
@ -1861,6 +1861,7 @@ class P4Submit(Command, P4UserMap):
|
||||
filesToAdd.remove(path)
|
||||
elif modifier == "C":
|
||||
src, dest = diff['src'], diff['dst']
|
||||
all_files.append(dest)
|
||||
p4_integrate(src, dest)
|
||||
pureRenameCopy.add(dest)
|
||||
if diff['src_sha1'] != diff['dst_sha1']:
|
||||
@ -1877,6 +1878,7 @@ class P4Submit(Command, P4UserMap):
|
||||
editedFiles.add(dest)
|
||||
elif modifier == "R":
|
||||
src, dest = diff['src'], diff['dst']
|
||||
all_files.append(dest)
|
||||
if self.p4HasMoveCommand:
|
||||
p4_edit(src) # src must be open before move
|
||||
p4_move(src, dest) # opens for (move/delete, move/add)
|
||||
|
||||
Reference in New Issue
Block a user