diff options
author | Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:10 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2019-02-05 14:26:10 -0800 |
commit | 40b8ba2c4458bd1ed6d32092712c07a4fc26e256 (patch) | |
tree | 7cef01f10ba730dc3f781fe49445581710ed4d8d /git-p4.py | |
parent | Merge branch 'jt/get-reference-with-commit-graph' (diff) | |
parent | git-p4: handle update of moved/copied files when updating a shelve (diff) | |
download | tgif-40b8ba2c4458bd1ed6d32092712c07a4fc26e256.tar.xz |
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
Diffstat (limited to 'git-p4.py')
-rwxr-xr-x | git-p4.py | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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) |