X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=ba76b1687e2210da81f1b7335ce9e521845fdb0f;hp=7b9bf313bc25161d9f6174e9035c421216695c57;hb=8dba4a073d1eddca7e15ad60d7d5c21d016e60fc;hpb=ad6c8798e2ac25be232b0906e3987eb0523fa57a

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 7b9bf313..ba76b168 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,6 +1,3 @@
-Tag rename unfinished business
-(things resulting from searching for `tag' where searching for
- `debiantag' wouldn't find them)
 
  - in dopush (?), we need to sort out synthetic fast forard
     this should not depend entirely on quilt mode
@@ -32,40 +29,16 @@ Test that, where appropriate, maint view tags are pushed to dgit git repo
 
  * Test all three new --quilt=unapplied|gbp|dpm
 
+ * Mention in-archive copy fix in debian/changelog
 
- * IN ARCHIVE COPY Consider and implement fast-forward fixup
-
-    - On fetch, check if specified git hash is ff from
-      existing dgit branch, the same way we do for constructed
-      dscs.  The .dsc tells us the git tree but not necessarily
-      the git hash.
-
-    ...ERR MAYBE...
-      
-         complicated there are many branches
-	       dgit-repos: refs/dgit/suite
-               archive dsc
-	       local; remotes/dgit/dgit/suite
-	                  must be ff
-			  may contain dscs
-               local: dgit/suite (not relevant to fetch)
-
-         archive dsc must always be regarded
-	       as ff from (or same as) dgit-repos
-               err depending on version number ?
-
-       this code is what needs changing
-       	} else {
-	    fail "git head (".lrref()."=$lastpush_hash) is not a ".
-		"descendant of archive's .dsc hash ($dsc_hash)";
-	}
-       it just needs to generate the fake merge and set $hash
-       the archive skew stuff is all fine with this
+ * Mention in changelog that:
+   Remove lrfetchrefs at end of fetch_from_archive, for tidyness
 
-        xxx actually, no, we need to stop from squashing our
-	lrref with + updates
+ * Want drs-quilt-gbp test.
 
- * Mention in-archive copy fix in debian/changelog
+ * Mention on changelog or docs that we no longer set a fetch spec for
+   the dgit remote (which doesn't really work anyway)
 
- * Add in-archive-move test case
+ * Split quilt-gbp-build-modes into one with sbuild and one without
 
+ * Add t-tstunt-parsechangelog to various tests