Fix single-branch imports by skipping the branch/merge detection correctly.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann committed
Feb 18, 2007 at 01:18 UTC
90dc3dfdc8ab903f5eb12f7081dd43b67c8c112a
1 file changed
+1
-1
contrib/fast-import/p4-fast-export.py
+1
-1
@@ -210,7 +210,7 @@ def commit(details, files, branch, branchPrefix):
210
merges = Set()
211
212
for file in files:
213
- if lastChange == 0:
213
+ if lastChange == 0 or not detectBranches:
214
continue
215
path = file["path"]
216
if not path.startswith(branchPrefix):