TODO.BRANCH: Add a new desire

[dgit.git] / TODO.BRANCH

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 7b9bf313bc25161d9f6174e9035c421216695c57..1008708c51c2967ec1b2d5cda0c9ae0eb3470eb6 100644 (file)
--- 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,10 @@ 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
+ * Mention in changelog that:
+   Remove lrfetchrefs at end of fetch_from_archive, for tidyness
+
+ * Want drs-quilt-gbp test.