From: Simon Hausmann Date: Thu, 7 Jun 2007 07:41:53 +0000 (+0200) Subject: Hack to make the multi-branch import work again with self.depotPaths now that X-Git-Tag: v1.5.3-rc0~65^2^2~20^2~10 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6509e19cd1f6b5620d339a2be35b8a160ab30794;p=git.git Hack to make the multi-branch import work again with self.depotPaths now that self.depotPath is gone Signed-off-by: Simon Hausmann --- diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index ff737d762..ececc4451 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -909,9 +909,10 @@ class P4Sync(Command): continue source = paths[0] destination = paths[1] - if source.startswith(self.depotPath) and destination.startswith(self.depotPath): - source = source[len(self.depotPath):-4] - destination = destination[len(self.depotPath):-4] + ## HACK + if source.startswith(self.depotPaths[0]) and destination.startswith(self.depotPaths[0]): + source = source[len(self.depotPaths[0]):-4] + destination = destination[len(self.depotPaths[0]):-4] if destination not in self.knownBranches: self.knownBranches[destination] = source if source not in self.knownBranches: