diff options
| author |  Simon Hausmann <shausman@trolltech.com> | 2007-05-16 09:43:13 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-05-16 09:43:13 +0200 |
| commit | c3c46244518178bac49caf21d6ba3a782292bb10 (patch) | |
| tree | 0d8909af4b1eaa0be483318a97e50a4b4e460ad0 | |
| parent | Added the possibility of skipping patches during git-p4 submit (diff) | |
| download | tgif-c3c46244518178bac49caf21d6ba3a782292bb10.tar.xz | |
Give a better hint if git-p4 submit fails
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index eba7a67c68..c48b257577 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(): |