diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-10-04 06:34:03 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-10-04 06:34:03 +0000 |
| commit | 6bb57185f698795a487cb8f09c29041adb88a7a4 (patch) | |
| tree | aaa0dc92efd81f485b2f529a6f5086063377db76 | |
| parent | b17768b315fe89e606df75a0da2cb228c50dd399 (diff) | |
| parent | 24483588faaf027c968ddde444a87853a5f5de23 (diff) | |
merge of '3720558b0d1400bac165546368a13f5ef5824873'
and 'fd803d898183d6c18157193aaa79a715b846876d'
| -rwxr-xr-x | contrib/mtn2git/mtn2git.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contrib/mtn2git/mtn2git.py b/contrib/mtn2git/mtn2git.py index 1de3010756..a4b43721d9 100755 --- a/contrib/mtn2git/mtn2git.py +++ b/contrib/mtn2git/mtn2git.py @@ -255,6 +255,8 @@ def fast_import(ops, revision): # could probably happen if we have more than one parent (on a merge)? cmd = [] + if len(revision["parent"]) == 0: + cmd += ["reset refs/heads/%s" % branch] cmd += ["commit refs/heads/%s" % branch] cmd += ["mark :%s" % get_mark(revision["revision"])] cmd += ["author <%s> %s" % (revision["author"], get_git_date(revision))] |