summaryrefslogtreecommitdiff
path: root/contrib/fast-import
diff options
context:
space:
mode:
authorSimon Hausmann <simon@lst.de>2007-08-21 09:53:02 (GMT)
committerSimon Hausmann <simon@lst.de>2007-09-03 18:27:02 (GMT)
commit31f9ec129ef37e50b5cacf26a2ebcb5420fcdc5e (patch)
tree669224da5f42c1088b7a0df06c2125bfd2702356 /contrib/fast-import
parent86bab9615c3516d4ac7756ae3c1285d331b78f04 (diff)
downloadgit-31f9ec129ef37e50b5cacf26a2ebcb5420fcdc5e.zip
git-31f9ec129ef37e50b5cacf26a2ebcb5420fcdc5e.tar.gz
git-31f9ec129ef37e50b5cacf26a2ebcb5420fcdc5e.tar.bz2
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>
Diffstat (limited to 'contrib/fast-import')
-rwxr-xr-xcontrib/fast-import/git-p45
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 55778c5..3728cbf 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