diff options
| author |  Simon Hausmann <shausman@trolltech.com> | 2007-05-21 23:25:51 +0200 |
|---|---|---|
| committer | Simon Hausmann <shausman@trolltech.com> | 2007-05-21 23:25:51 +0200 |
| commit | af8da89cb7225c7938a836de0812467c059ca52d (patch) | |
| tree | 519fa85b87c13700323b8fcb33aa7af3b7ef54d9 /contrib | |
| parent | Added a rollback command for debugging. It sets back the heads of the p4 bran... (diff) | |
| download | tgif-af8da89cb7225c7938a836de0812467c059ca52d.tar.xz | |
Fix branch detection in multi-branch imports
Signed-off-by: Simon Hausmann <shausman@trolltech.com>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 40264cdc18..515f7a906f 100755 --- a/contrib/fast-import/git-p4 +++ b/contrib/fast-import/git-p4 @@ -556,7 +556,7 @@ class P4Sync(Command): relPath = path[len(self.depotPath):] for branch in self.knownBranches.keys(): - if relPath.startswith(branch): + if relPath.startswith(branch + "/"): # add a trailing slash so that a commit into qt/4.2foo doesn't end up in qt/4.2 if branch not in branches: branches[branch] = [] branches[branch].append(file) |