From c79b8b7d0b25229da091b6f9a4535c11b0669678 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon@luria.(none)>
Date: Mon, 12 Feb 2007 21:44:02 +0100
Subject: [PATCH] don't write out too many merges

---
 p4-fast-export.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/p4-fast-export.py b/p4-fast-export.py
index f9653f1..5838ca3 100755
--- a/p4-fast-export.py
+++ b/p4-fast-export.py
@@ -171,6 +171,8 @@ def commit(details, files, branch, branchPrefix):
         gitStream.write("from %s\n" % initialParent)
         initialParent = ""
 
+    mergedBranches = set()
+
     for file in files:
         path = file["path"]
         if not path.startswith(branchPrefix):
@@ -202,8 +204,9 @@ def commit(details, files, branch, branchPrefix):
         relPath = source[len(globalPrefix):]
 
         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)
+                mergedBranches.add(branch)
                 break
 
     for file in files:
-- 
2.11.4.GIT