mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-20 14:13:58 +01:00
Code

Give a better hint if git-p4 submit fails

Browse Source 
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
Simon Hausmann 2007-05-16 09:43:13 +02:00
parent d336c15835
commit c3c4624451
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/fast-import/git-p4
View File

@ -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():