X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=a81ca5581926ad3a2a03794b2cc737090b0ded42;hp=1008708c51c2967ec1b2d5cda0c9ae0eb3470eb6;hb=15b1af481906f016401f5c16fc548538ad43e806;hpb=3310ac0e92955349d5e472569cd424596ecfba40

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 1008708c..a81ca558 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -2,9 +2,11 @@
  - 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.
 
 
 Want tests for
@@ -16,9 +18,6 @@ Want tests for
  - 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
-
-
  * Provide --gpbpq[=:] options
 
  * Document --quilt=unapplied|gbp|dpm
@@ -36,3 +35,12 @@ Test that, where appropriate, maint view tags are pushed to dgit git repo
 
  * 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
+
+
+Check BTS