X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=ba76b1687e2210da81f1b7335ce9e521845fdb0f;hp=e342f1afc64f8df60e1d01dc25041c5f07ae9308;hb=f81f0db4c42e6f9439146680b0bd057d0d64b672;hpb=dccb73b082268949abbc074e9fe89d6ec294fd15

diff --git a/TODO.BRANCH b/TODO.BRANCH
index e342f1af..ba76b168 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -29,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
-
-        xxx actually, no, we need to stop from squashing our
-	lrref with + updates
+ * Mention in changelog that:
+   Remove lrfetchrefs at end of fetch_from_archive, for tidyness
 
- * Mention in-archive copy fix in debian/changelog
+ * Want drs-quilt-gbp test.
+
+ * 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