From f6f9683a235bc1c874503806a1a6ba0651638220 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 16 May 2007 09:43:13 +0200 Subject: [PATCH] Give a better hint if git-p4 submit fails --- git-p4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-p4 b/git-p4 index eba7a67..c48b257 100755 --- a/git-p4 +++ b/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(): -- 2.11.4.GIT