diff options
| author |  Simon Hausmann <hausmann@kde.org> | 2007-02-07 23:09:49 +0100 |
|---|---|---|
| committer | Simon Hausmann <hausmann@kde.org> | 2007-02-07 23:09:49 +0100 |
| commit | e3d37cf0980646b3dbc19e01684c665482a3129d (patch) | |
| tree | 5393f51be994a03839ed5b91cf68557032206c05 /contrib | |
| parent | Minor cleanups and print an error message of git fast-import if it fails. (diff) | |
| download | tgif-e3d37cf0980646b3dbc19e01684c665482a3129d.tar.xz | |
Fixed incremental imports by using the correct "from" command instead of "merge" with git fast-import.
Signed-off-by: Simon Hausmann <hausmann@kde.org>
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/fast-import/p4-fast-export.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py index 06de0eae6d..3e573cd786 100755 --- a/contrib/fast-import/p4-fast-export.py +++ b/contrib/fast-import/p4-fast-export.py @@ -88,7 +88,7 @@ def commit(details): gitStream.write("EOT\n\n") if len(initialParent) > 0: - gitStream.write("merge %s\n" % initialParent) + gitStream.write("from %s\n" % initialParent) initialParent = "" fnum = 0 |