Fix multi-branch import with --silent.
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
parent
ad192f2888
commit
b3fd1b2808
@ -831,7 +831,8 @@ class P4Sync(Command):
|
|||||||
|
|
||||||
# this needs to be called after the conversion from heads/p4 to remotes/p4/master
|
# this needs to be called after the conversion from heads/p4 to remotes/p4/master
|
||||||
self.listExistingP4GitBranches()
|
self.listExistingP4GitBranches()
|
||||||
if len(self.p4BranchesInGit) > 1 and not self.silent:
|
if len(self.p4BranchesInGit) > 1:
|
||||||
|
if not self.silent:
|
||||||
print "Importing from/into multiple branches"
|
print "Importing from/into multiple branches"
|
||||||
self.detectBranches = True
|
self.detectBranches = True
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user