X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=BUGS;h=0225abf6da51bd3ed9dca04dd50e11cbc391dbd3;hp=14a4a136aef4d5426514e9470d6cc1b1cd179b13;hb=5ae399ddff45b6edb446ee5d9b779fb91985e439;hpb=effecc36db10d6fe9562097242d60e2be102407a

diff --git a/BUGS b/BUGS
index 14a4a13..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
@@ -23,3 +33,5 @@ wibblings:
 what about ops which update multiple refs - atomicity ?
  think about this later but for now abstract away commit and
  other ref update
+
+also would like some kind of --ff-only update ?