X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=TODO.BRANCH;h=81872b3b0a89d5da5e7530eda5e7624238699be2;hb=6f7188362310cede631eb9bdb361a784b6fbc79f;hp=35473bb3fd63050e5a513e84fe6be54fd1edc583;hpb=06816facaece790906660017bfecbf94540b113f;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 35473bb3..81872b3b 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,28 +17,34 @@ 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
 
+OTHER
+
+ * Better import format for complex .dscs
 
  * 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)
+