X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=c32550d06060e47bc08f3214bf4f8e86ee8d5201;hp=69efcae653abc316bd8f08c956ac0ad4bc2479f4;hb=dfffe7904e65453f3d8c0bc3c0ac22b6b320acd4;hpb=0c398a9586ef4807c3e6f2eec87173b2e081369a

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 69efcae6..c32550d0 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -29,41 +29,6 @@ Test that, where appropriate, maint view tags are pushed to dgit git repo
 
  * Test all three new --quilt=unapplied|gbp|dpm
 
-
- * 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-archive copy fix in debian/changelog
 
- * Add in-archive-move test case
-
  * Remove lrfetchrefs at end of fetch_from_archive, for tidyness