提交 330f53b8 编写于 作者: S Simon Hausmann

Don't attempt to set the initialParent on multi-branch imports (useless).

At some point the code paths should be unified, but for now I need a working
git-p4 :)
Signed-off-by: NSimon Hausmann <shausman@trolltech.com>
上级 583e1707
......@@ -1071,7 +1071,8 @@ class P4Sync(Command):
if p4Change > 0:
self.depotPaths = sorted(self.previousDepotPaths)
self.changeRange = "@%s,#head" % p4Change
self.initialParent = parseRevision(self.branch)
if not self.detectBranches:
self.initialParent = parseRevision(self.branch)
if not self.silent and not self.detectBranches:
print "Performing incremental import into %s git branch" % self.branch
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册