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>

diff --git a/contrib/fast-import/p4-git-sync.py b/contrib/fast-import/p4-git-sync.py
index 4f020798956ddf0ccf3968fb3f925578acb9b44b..e07fcee42c13e98a8a34de982eb3cc2f5bb14b60 100755 (executable)
--- a/contrib/fast-import/p4-git-sync.py
+++ b/contrib/fast-import/p4-git-sync.py
@@ -276,8 +276,8 @@ def apply(id):
         print "Deleting temporary p4-sync branch and going back to %s" % master
         system("git checkout %s" % master)
         system("git branch -D p4-sync")
-        print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert -a ..."
-        system("p4 edit ...")
-        system("p4 revert -a ...")
+        print "Cleaning out your perforce checkout by doing p4 edit ... ; p4 revert ..."
+        system("p4 edit ... >/dev/null")
+        system("p4 revert ... >/dev/null")
     os.remove(configFile)