Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Hack to make the multi-branch import work again with self.depotPaths now that
author
Simon Hausmann
<shausman@trolltech.com>
Thu, 7 Jun 2007 07:41:53 +0000
(09:41 +0200)
committer
Simon Hausmann
<shausman@trolltech.com>
Thu, 7 Jun 2007 07:41:53 +0000
(09:41 +0200)
self.depotPath is gone
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
contrib/fast-import/git-p4
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
330f53b
)
diff --git
a/contrib/fast-import/git-p4
b/contrib/fast-import/git-p4
index ff737d762cdddcbe80828e725911ab88c62bf48d..ececc445183160fe77217d3aae924b5315671508 100755
(executable)
--- 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]
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:
if destination not in self.knownBranches:
self.knownBranches[destination] = source
if source not in self.knownBranches: