Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Simon Hausmann committed
Feb 7, 2007 at 23:09 UTC
e3d37cf0980646b3dbc19e01684c665482a3129d
1 file changed
+1
-1
contrib/fast-import/p4-fast-export.py
+1
-1
@@ -88,7 +88,7 @@ def commit(details):
88
gitStream.write("EOT\n\n")
89
90
if len(initialParent) > 0:
91
- gitStream.write("merge %s\n" % initialParent)
91
+ gitStream.write("from %s\n" % initialParent)
92
initialParent = ""
93
94
fnum = 0