aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2007-09-13 22:10:18 +0200
committerSimon Hausmann <simon@lst.de>2007-10-20 17:12:02 +0200
commit209471493afbf30d5c1fc80feadfc4836b86dc42 (patch)
tree9c2dead0fd8e634d4569922c8ff65289db831917 /contrib
parent7840ce6cb24a9d65152d45e08f5d7cf7dc97a2e3 (diff)
downloadgit-209471493afbf30d5c1fc80feadfc4836b86dc42.tar.gz
git-209471493afbf30d5c1fc80feadfc4836b86dc42.tar.xz
git-p4: When skipping a patch as part of "git-p4 submit" make sure we correctly revert to the previous state of the files using "p4 revert".
Signed-off-by: Simon Hausmann <simon@lst.de>
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/fast-import/git-p44
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 52cd2a46b..e1dc26301 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -529,6 +529,10 @@ class P4Submit(Command):
"and with .rej files / [w]rite the patch to a file (patch.txt) ")
if response == "s":
print "Skipping! Good luck with the next patches..."
+ for f in editedFiles:
+ system("p4 revert \"%s\"" % f);
+ for f in filesToAdd:
+ system("rm %s" %f)
return
elif response == "a":
os.system(applyPatchCmd)