Nemcio/Fast-Export
1
0
Fork 0
mirror of https://github.com/frej/fast-export.git synced 2025-11-08 12:15:39 +01:00
Code Issues Packages Projects Releases Activity

don't write out too many merges

Browse Source
This commit is contained in:
Simon Hausmann
2007-02-12 21:44:02 +01:00
parent cfc3ed814a
commit c79b8b7d0b
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
p4-fast-export.py
View File

@@ -171,6 +171,8 @@ def commit(details, files, branch, branchPrefix):
gitStream.write("from %s\n" % initialParent) gitStream.write("from %s\n" % initialParent)
initialParent = "" initialParent = ""
mergedBranches = set()
for file in files: for file in files:
path = file["path"] path = file["path"]
if not path.startswith(branchPrefix): if not path.startswith(branchPrefix):
@@ -202,8 +204,9 @@ def commit(details, files, branch, branchPrefix):
relPath = source[len(globalPrefix):] relPath = source[len(globalPrefix):]
for branch in knownBranches: for branch in knownBranches:
if relPath.startswith(branch): if relPath.startswith(branch) and branch not in mergedBranches:
gitStream.write("merge refs/heads/%s\n" % branch) gitStream.write("merge refs/heads/%s\n" % branch)
mergedBranches.add(branch)
break break
for file in files: for file in files: