kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Simon Hausmann 2007-09-13 22:10:18 +02:00
parent 7840ce6cb2
commit 209471493a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/fast-import/git-p4
View File

@ -529,6 +529,10 @@ class P4Submit(Command):
"and with .rej files / [w]rite the patch to a file (patch.txt) ") "and with .rej files / [w]rite the patch to a file (patch.txt) ")
if response == "s": if response == "s":
print "Skipping! Good luck with the next patches..." 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 return
elif response == "a": elif response == "a":
os.system(applyPatchCmd) os.system(applyPatchCmd)