diff options
Diffstat (limited to 'contrib/mtn2git/mtn2git.py')
| -rwxr-xr-x | contrib/mtn2git/mtn2git.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/mtn2git/mtn2git.py b/contrib/mtn2git/mtn2git.py index 2d7e0c3366..5c39e7450a 100755 --- a/contrib/mtn2git/mtn2git.py +++ b/contrib/mtn2git/mtn2git.py @@ -223,6 +223,10 @@ def fast_import(ops, revision): all_modifications = all_modifications.union(modified) all_deleted = all_modifications.union(deleted) + # TODO: + # Readd the sanity check to see if we deleted and modified an entry. This + # could probably happen if we have more than one parent (on a merge)? + cmd = [] cmd += ["commit refs/heads/%s" % branch] cmd += ["mark :%s" % get_mark(revision["revision"])] |