X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=0951402cbd7c231b66690dc3303e58cfe27a9552;hp=8279dafe532f84791c14c8a41dc979277f641f42;hb=cc9deb8e711981e5b7e980fca84f9b7ca07d4b39;hpb=661606fd33d2c07248306564cb9f76a875c4a655

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 8279dafe..0951402c 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,76 +1,33 @@
-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
-    but will always be needed if quiltmode_splitbrain
-     * On push, if ff fixup mode enabled, check debian/changelog,
-       and maybe make fake merge, maybe in dgit view, maybe
-       elsewhere ?
+OTHER
 
- - there is some confusion between $split_brain (did we actually
-   generate any commits) and quiltmode_splitbrain (might we have done,
-   including in previous pushes); search for $split_brain and check
-   that use sites are correct
+ * Replace quilt patch generation with git-format-patch output
+   Honour (and strip) Gbp-Pq Topic and Gbp-Pq Name
 
+ * Provide --gpbpq[=:] options
+ * When invoking gbp pq internally, use --color=off
+ * When invoking gbp pq during import, redirect stderr
+   and print only on failure
 
-Want tests for
-
- - start repo with old tag, push with new tag, run
-   "old" dgit to push again with new tag, push again with
-   old tag
-
- - rejecting push of same version with one tag when then the other
+ * Fix up README.dsc-import to describe actual algorithm as implemented
 
+ * Document --quilt=unapplied|gbp|dpm
 
-Test that, where appropriate, maint view tags are pushed to dgit git repo
 
+CHECK BTS
 
- * Provide --gpbpq[=:] options
 
- * Document --quilt=unapplied|gbp|dpm
+CHANGELOG
 
  * Mention new tag format in debian/changelog
 
  * Mention new --quilt=* in debian/changelog
 
- * 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
+
+ * Mention on changelog or docs that we no longer set a fetch spec for
+   the dgit remote (which doesn't really work anyway)