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: Simon Hausmann <shausman@trolltech.com>
This commit is contained in:
parent
583e170706
commit
330f53b8d6
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user