[oe-commits] org.oe.dev * Import revisions without a parent properly! The diffing would have been all right but

freyther commit openembedded-commits at lists.openembedded.org
Sun Jan 13 17:34:15 UTC 2008


* Import revisions without a parent properly! The diffing would have been all right but
  we have not diffed the two manifests at all. Now we are diffinf an empty manifest against
  the initial one.

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

#
# mt diff -red94d35280e9dbc28ff90a5b175dc47c752bf347 -r99e95c6aa6cd2cfaa8e12cb3eea646ce3aa4b0b4
#
# 
# 
# patch "contrib/mtn2git/mtn2git.py"
#  from [152252b8f2f7f57c70d678432bd6cb8fa63f8946]
#    to [297eddadcd696512807e518be7c93b3ba56f2328]
# 
============================================================
--- contrib/mtn2git/mtn2git.py	152252b8f2f7f57c70d678432bd6cb8fa63f8946
+++ contrib/mtn2git/mtn2git.py	297eddadcd696512807e518be7c93b3ba56f2328
@@ -244,6 +244,12 @@ def fast_import(ops, revision):
         all_modifications = all_modifications.union(modified)
         all_deleted = all_deleted.union(deleted) 
 
+    if len(revision["parent"]) == 0:
+        (added, modified, deleted) = diff_manifest(build_tree([],""), current_tree)
+        all_added = all_added.union(added)
+        all_modifications = all_modifications.union(modified)
+        all_deleted = all_deleted.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)?






More information about the Openembedded-commits mailing list