mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-09-28 04:10:41 +02:00
Code

After marking a p4 branch as merged don't ever merge it in git again.

Browse Source 
Signed-off-by: Simon Hausmann <simon@lst.de>
This commit is contained in:
Simon Hausmann 2007-02-12 21:44:02 +01:00
parent dcacf8b447
commit 53b03239aa
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/fast-import/p4-fast-export.py
View File

@ -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: