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

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 34c462d4..141a3aab 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,35 +1,34 @@
 
- - 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 ?
+SPLIT BRAIN
 
+  * Check archive allegedly supports split brain mode before running
+    off into the weeds and crashing out in the push.
 
-Want tests for
 
- - start repo with old tag, push with new tag, run
-   "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
+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)
+