@@ -1875,6 +1875,7 @@ def applyCommit(self, id):
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)
@@ -546,7 +546,7 @@ test_expect_success 'submit --update-shelve' '
)
'
-test_expect_failure 'update a shelve involving a moved file' '
+test_expect_success 'update a shelve involving a moved file' '
test_when_finished cleanup_git &&
(
cd "$cli" &&
Perforce requires a complete list of files being operated on. If git is updating an existing shelved changelist, then any files which are moved were not being added to this list. Signed-off-by: Luke Diamand <luke@diamand.org> --- git-p4.py | 1 + t/t9807-git-p4-submit.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)