X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=9d2866e58602b4f82dd12f71bfd3b44355186766;hp=ba76b1687e2210da81f1b7335ce9e521845fdb0f;hb=e0f2481785baebd56a8082c9353071ae83c11922;hpb=d655b298e3ac4ecba08885ab8c96cdbafc83c155

diff --git a/TODO.BRANCH b/TODO.BRANCH
index ba76b168..9d2866e5 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -2,10 +2,14 @@
  - 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 ?
 
+    We want a --overwrite=VERSION option which 1. adjusts
+    the version used above, and 2. does the same thing in any
+    quilt mode.  If no split brain it should make the psuedomerge
+    on the user's HEAD.
+
+
+TESTS
 
 Want tests for
 
@@ -13,32 +17,38 @@ Want tests for
    "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 all three new --quilt=unapplied|gbp|dpm
 
-Test that, where appropriate, maint view tags are pushed to dgit git repo
+ * Want drs-quilt-gbp test.
 
+ * Split quilt-gbp-build-modes into one with sbuild and one without
+
+ * Add t-tstunt-parsechangelog to various tests
+
+
+
+OTHER
 
  * Provide --gpbpq[=:] options
 
  * Document --quilt=unapplied|gbp|dpm
 
+
+CHECK BTS
+
+
+CHANGELOG
+
  * Mention new tag format in debian/changelog
 
  * Mention new --quilt=* in debian/changelog
 
- * Test all three new --quilt=unapplied|gbp|dpm
-
  * Mention in-archive copy fix in debian/changelog
 
  * Mention in changelog that:
    Remove lrfetchrefs at end of fetch_from_archive, for tidyness
 
- * 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)
 
- * Split quilt-gbp-build-modes into one with sbuild and one without
-
- * Add t-tstunt-parsechangelog to various tests