From: Simon Hausmann <shausman@trolltech.com>
Date: Wed, 16 May 2007 07:43:13 +0000 (+0200)
Subject: Give a better hint if git-p4 submit fails
X-Git-Tag: v1.5.3-rc0~65^2^2~112
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c3c46244518178bac49caf21d6ba3a782292bb10;p=git.git

Give a better hint if git-p4 submit fails

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index eba7a67c6..c48b25757 100755
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -193,7 +193,7 @@ class P4Submit(Command):
 
     def start(self):
         if len(self.config) > 0 and not self.reset:
-            die("Cannot start sync. Previous sync config found at %s" % self.configFile)
+            die("Cannot start sync. Previous sync config found at %s\nIf you want to start submitting again from scratch maybe you want to call git-p4 submit --reset" % self.configFile)
 
         commits = []
         for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():