Hack to make the multi-branch import work again with self.depotPaths now that
self.depotPath is gone Signed-off-by: Simon Hausmann <shausman@trolltech.com>maint
parent
330f53b8d6
commit
6509e19cd1
|
@ -909,9 +909,10 @@ class P4Sync(Command):
|
||||||
continue
|
continue
|
||||||
source = paths[0]
|
source = paths[0]
|
||||||
destination = paths[1]
|
destination = paths[1]
|
||||||
if source.startswith(self.depotPath) and destination.startswith(self.depotPath):
|
## HACK
|
||||||
source = source[len(self.depotPath):-4]
|
if source.startswith(self.depotPaths[0]) and destination.startswith(self.depotPaths[0]):
|
||||||
destination = destination[len(self.depotPath):-4]
|
source = source[len(self.depotPaths[0]):-4]
|
||||||
|
destination = destination[len(self.depotPaths[0]):-4]
|
||||||
if destination not in self.knownBranches:
|
if destination not in self.knownBranches:
|
||||||
self.knownBranches[destination] = source
|
self.knownBranches[destination] = source
|
||||||
if source not in self.knownBranches:
|
if source not in self.knownBranches:
|
||||||
|
|
Loading…
Reference in New Issue