[oe-commits] org.oe.dev * Incrementally updating the former heads did not work right. Sometimes we have

[freyther commit]

* Incrementally updating the former heads did not work right. Sometimes we have
  saved bogus data and it could be dangerous.
* Back-out this change and save the heads at the end of the script.

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: 99d10c4327664b741cfed74f3f99ac3f6d9e5b7b
ViewMTN: http://monotone.openembedded.org/revision/info/99d10c4327664b741cfed74f3f99ac3f6d9e5b7b
Files:
1
contrib/mtn2git/mtn2git.py
Diffs:

#
# mt diff -r99e95c6aa6cd2cfaa8e12cb3eea646ce3aa4b0b4 -r99d10c4327664b741cfed74f3f99ac3f6d9e5b7b
#
# 
# 
# patch "contrib/mtn2git/mtn2git.py"
#  from [297eddadcd696512807e518be7c93b3ba56f2328]
#    to [1358f112d3cb844a52d78b014809a8a5a6609bc4]
# 
============================================================
--- contrib/mtn2git/mtn2git.py	297eddadcd696512807e518be7c93b3ba56f2328
+++ contrib/mtn2git/mtn2git.py	1358f112d3cb844a52d78b014809a8a5a6609bc4
@@ -430,10 +430,7 @@ def main(mtn_cli, db, rev):
         for head in heads:
             print >> sys.stderr, old_heads, head
             all_revs += ops.ancestry_difference(head, old_heads)
-            for rev in all_revs:
-                if not rev in branch_heads:
-                    branch_heads[rev] = []
-                branch_heads[rev].append(branch)
+        status.former_heads[branch] = heads
 
     
     sorted_revs = [rev for rev in ops.toposort(all_revs)]
@@ -443,10 +440,6 @@ def main(mtn_cli, db, rev):
         else:
             print >> sys.stderr, "Going to import revision ", rev
             fast_import(ops, parse_revision(ops, rev))
-        branches = branch_heads[rev]
-        for branch in branches:
-            status.former_heads[branch] = [rev]
-        
 
 if __name__ == "__main__":
     import optparse
@@ -471,3 +464,4 @@ if __name__ == "__main__":
         print >> sys.stderr, "Failed to open the status file"
     main(options.mtn, options.database, options.rev)
     status.store(options.status)
+