diff options
| author |  Simon Hausmann <shausman@trolltech.com> | 2007-06-07 09:41:53 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-06-07 09:41:53 +0200 |
| commit | 6509e19cd1f6b5620d339a2be35b8a160ab30794 (patch) | |
| tree | 604d525bfb98c320612f3c8f7db2d9bdefe66e1c | |
| parent | Don't attempt to set the initialParent on multi-branch imports (useless). (diff) | |
| download | tgif-6509e19cd1f6b5620d339a2be35b8a160ab30794.tar.xz | |
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>
| -rwxr-xr-x | contrib/fast-import/git-p4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index ff737d762c..ececc44518 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: |