From: Simon Hausmann <simon@lst.de>
Date: Tue, 21 Aug 2007 09:53:02 +0000 (+0200)
Subject: git-p4: Always call 'p4 sync ...' before submitting to Perforce.
X-Git-Tag: v1.5.4-rc0~456^2~7
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=31f9ec129ef37e50b5cacf26a2ebcb5420fcdc5e;p=git.git

git-p4: Always call 'p4 sync ...' before submitting to Perforce.

Acked-by: Marius Storm-Olsen <marius@trolltech.com>
Acked-by: Thiago Macieira <thiago@kde.org>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 55778c577..3728cbf9a 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -664,9 +664,8 @@ class P4Submit(Command):
             f.close();
 
         os.chdir(self.clientPath)
-        response = raw_input("Do you want to sync %s with p4 sync? [y]es/[n]o " % self.clientPath)
-        if response == "y" or response == "yes":
-            system("p4 sync ...")
+        print "Syncronizing p4 checkout..."
+        system("p4 sync ...")
 
         if self.reset:
             self.firstTime = True