X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=topbloke.git;a=blobdiff_plain;f=BUGS;h=ec692dd0425ff92e6ea9e110bb09f57c43bdad1e;hp=df77a9fbd98641bbd0b783780e4111d0ac67e745;hb=e9bcefd93e14d2d8d2906efdd713cde6be4c4fa5;hpb=e7a04f5c030191f438b9556cd0701d1cd4950589

diff --git a/BUGS b/BUGS
index df77a9f..ec692dd 100644
--- a/BUGS
+++ b/BUGS
@@ -1,19 +1,13 @@
-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 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
 
 	"checkout" shouldn't do any updates but also want
 	"goto" or "push" or "pop" or something which does do updates
@@ -29,3 +23,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 ?