@matheusbsbs / matheus-bagliano / commits / c3c4624451
Fork 0

Give a better hint if git-p4 submit fails

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

Simon Hausmann committed May 16, 2007 at 09:43 UTC c3c46244518178bac49caf21d6ba3a782292bb10
1 file changed +1 -1
contrib/fast-import/git-p4
+1 -1
@@ -193,7 +193,7 @@ class P4Submit(Command):
193
194 def start(self):
195 if len(self.config) > 0 and not self.reset:
196 - die("Cannot start sync. Previous sync config found at %s" % self.configFile)
196 + 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)
197
198 commits = []
199 for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():