Pseudomerge: pseudomerge_make_commit: Lift up some message generation

[dgit.git] / TODO.BRANCH

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 7b9bf313bc25161d9f6174e9035c421216695c57..141a3aab22f2257a0b2b0f28f6490d1ed48216cc 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,71 +1,34 @@
-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 ?
+SPLIT BRAIN
 
+  * Check archive allegedly supports split brain mode before running
+    off into the weeds and crashing out in the push.
 
-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
-
-
-Test that, where appropriate, maint view tags are pushed to dgit git repo
+OTHER
 
+ * Better import format for complex .dscs
 
  * Provide --gpbpq[=:] options
 
  * Document --quilt=unapplied|gbp|dpm
 
- * Mention new tag format in debian/changelog
-
- * Mention new --quilt=* in debian/changelog
-
- * Test all three new --quilt=unapplied|gbp|dpm
 
+CHECK BTS
 
- * 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.
+CHANGELOG
 
-    ...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 new tag format in debian/changelog
 
-        xxx actually, no, we need to stop from squashing our
-       lrref with + updates
+ * Mention new --quilt=* in debian/changelog
 
  * 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)