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>
This commit is contained in:
parent
7840ce6cb2
commit
209471493a
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user