Results of testing git merging

[topbloke.git] / BUGS

diff --git a/BUGS b/BUGS
index 14a4a136aef4d5426514e9470d6cc1b1cd179b13..ffce80d0d0d12168edcd9deeb295341529d1add6 100644 (file)
--- a/BUGS
+++ b/BUGS
@@ -1,10 +1,20 @@
 merge alg needs to check for cyclic dependencies
 
+when creating needs to remove metadata, make a separate commit with no
+metadata to allow us to spot what's happening.  should only do this
+with option to permit it!  Also need to do this when merging.
+
 wibblings:
        what about strangeness in ancient history wrt merge alg
        topgit import
-              topbloke {base,tip} is ff desc of topgit {base,tip}
-               with metadata adjusted
+               topbloke {base,tip} is ff desc of topgit {base,tip}
+                with metadata adjusted
+               topbloke branch has all the deps of the topgit
+                branch (topgit branches mapped into topbloke
+                branches) plus the topgit branch itself named in
+                flags
+               reject topbloke imports of topgit branches which
+                also contain topbloke metadata
        need patch name in metadata
        patch dep metadata syntax unsatisfactory: too twiddly
        flags metadata unsatisfactory: wants to be valued properties