X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=git-p4.py;h=5b79920f46a972437ff05966d042a84d44f050d9;hb=8f0f46539a8c557985241f3aec7a12bd5f2634c2;hp=3e12774f96bb185bb6860290ad187c986ec7fa76;hpb=27dc9eb7f9646ae43ddfa7c9c55f64016b9c2182;p=thirdparty%2Fgit.git diff --git a/git-p4.py b/git-p4.py index 3e12774f96..5b79920f46 100755 --- a/git-p4.py +++ b/git-p4.py @@ -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)