X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=BUGS;h=0225abf6da51bd3ed9dca04dd50e11cbc391dbd3;hb=2799df8533bddff6feeee7c1b9d31cc6583e04f9;hp=e8a307d869cf6b5933a6c36c3e8fe9caba8c9221;hpb=99e020c85e1a90a9579f59e525ba42916aedb703;p=topbloke.git

diff --git a/BUGS b/BUGS
index e8a307d..0225abf 100644
--- 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
@@ -21,4 +31,7 @@ wibblings:
 	       which is inserted into all clients' deps
 
 what about ops which update multiple refs - atomicity ?
- think about this later
+ think about this later but for now abstract away commit and
+ other ref update
+
+also would like some kind of --ff-only update ?