X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=288a9c78fca812570aa71a859adeced45f7c73c6;hp=35473bb3fd63050e5a513e84fe6be54fd1edc583;hb=ae0be57dee74ad701f67dfa484fe983808311762;hpb=06816facaece790906660017bfecbf94540b113f

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 35473bb3..288a9c78 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
@@ -13,11 +15,6 @@ 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 that, where appropriate, maint view tags are pushed to dgit git repo
-
 
  * Provide --gpbpq[=:] options
 
@@ -38,3 +35,10 @@ Test that, where appropriate, maint view tags are pushed to dgit git repo
 
  * 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