summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2008-01-08 03:16:18 +0000
committerHolger Freyther <zecke@selfish.org>2008-01-08 03:16:18 +0000
commita99004bdc6d8c65c0b5dceaef78768b230ddcb7e (patch)
tree72fcfeccab7c0ebc4558e2cc3998db0609ef4274
parent209b24d410d77f58e1bc5251c4a49d987a607eb1 (diff)
contrib/mtn2git/mtn2git.py: Add the TODO for sanity checking!
-rwxr-xr-xcontrib/mtn2git/mtn2git.py4
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"])]