summaryrefslogtreecommitdiff
path: root/git-p4.py
diff options
context:
space:
mode:
authorPete Wyckoff <pw@padd.com>2012-09-09 20:16:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-09-17 04:52:52 (GMT)
commitf7fbc981a4effde51446c2229e34f2fc9210d31d (patch)
tree5cffd1ff4db86a1776a2ebe7dcc92b1a43a2defd /git-p4.py
parent5a41c16a81927bbccbcb00895b168a6d560b8c2c (diff)
downloadgit-f7fbc981a4effde51446c2229e34f2fc9210d31d.zip
git-f7fbc981a4effde51446c2229e34f2fc9210d31d.tar.gz
git-f7fbc981a4effde51446c2229e34f2fc9210d31d.tar.bz2
git p4: test clean-up after failed submit, fix added files
Test a variety of cases where a patch failed to apply to p4 and had to be cleaned up. If the patch failed to apply cleanly, do not try to remove to-be-added files, as they have not really been added yet. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-p4.py')
-rwxr-xr-xgit-p4.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/git-p4.py b/git-p4.py
index 39fa2e1..0481f43 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1200,8 +1200,6 @@ class P4Submit(Command, P4UserMap):
if not patch_succeeded:
for f in editedFiles:
p4_revert(f)
- for f in filesToAdd:
- os.remove(f)
return False
system(applyPatchCmd)