diff options
| author |  Simon Hausmann <hausmann@kde.org> | 2007-02-18 01:18:22 +1000 |
|---|---|---|
| committer | Simon Hausmann <hausmann@kde.org> | 2007-02-18 01:18:22 +1000 |
| commit | 90dc3dfdc8ab903f5eb12f7081dd43b67c8c112a (patch) | |
| tree | 797ee07cc067d5081df0a0ac082df88b4ccf60de /contrib/fast-import | |
| parent | Use sets.Set() instead of set() to run also with older versions of Python. (diff) | |
| download | tgif-90dc3dfdc8ab903f5eb12f7081dd43b67c8c112a.tar.xz | |
Fix single-branch imports by skipping the branch/merge detection correctly.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/p4-fast-export.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py index 76c4b9d323..f37fdcf96e 100755 --- a/contrib/fast-import/p4-fast-export.py +++ b/contrib/fast-import/p4-fast-export.py @@ -210,7 +210,7 @@ def commit(details, files, branch, branchPrefix): merges = Set() for file in files: - if lastChange == 0: + if lastChange == 0 or not detectBranches: continue path = file["path"] if not path.startswith(branchPrefix): |