Use p4 revert ... instead of revert -a ... after submitting, to make sure the p4 checkout is clean.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
This commit is contained in:
@ -276,8 +276,8 @@ if len(commits) == 0:
|
|||||||
print "Deleting temporary p4-sync branch and going back to %s" % master
|
print "Deleting temporary p4-sync branch and going back to %s" % master
|
||||||
system("git checkout %s" % master)
|
system("git checkout %s" % master)
|
||||||
system("git branch -D p4-sync")
|
system("git branch -D p4-sync")
|
||||||
print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert -a ..."
|
print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
|
||||||
system("p4 edit ...")
|
system("p4 edit ... >/dev/null")
|
||||||
system("p4 revert -a ...")
|
system("p4 revert ... >/dev/null")
|
||||||
os.remove(configFile)
|
os.remove(configFile)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user