X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=a8f5deb5230eb947eea3dcd55f033e315dd4003c;hb=57fe9181f58d6a311dd105283eff2be055de26b6;hp=34c462d4975a465282f93c9d8e0a6d043d10a48d;hpb=95872ab5c8650af9003677b0ad25d05c2d1ae4d0;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 34c462d4..a8f5deb5 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 pseudomerge
+    on the user's HEAD.
+
+
+TESTS
 
 Want tests for
 
@@ -13,23 +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
+
+ * Mention on changelog or docs that we no longer set a fetch spec for
+   the dgit remote (which doesn't really work anyway)
+