Give a better hint if git-p4 submit fails

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
maint
Simon Hausmann 2007-05-16 09:43:13 +02:00
parent d336c15835
commit c3c4624451
1 changed files with 1 additions and 1 deletions

View File

@ -193,7 +193,7 @@ class P4Submit(Command):


def start(self): def start(self):
if len(self.config) > 0 and not self.reset: 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 = [] commits = []
for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines(): for line in mypopen("git rev-list --no-merges %s..%s" % (self.origin, self.master)).readlines():