X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=141a3aab22f2257a0b2b0f28f6490d1ed48216cc;hb=a840640baebaa11079b64be2ae5f89a111648985;hp=9d2866e58602b4f82dd12f71bfd3b44355186766;hpb=a76f225dd9f40fb964058702a88a30ddffb17b23;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 9d2866e5..141a3aab 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,35 +1,15 @@
 
- - 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
+SPLIT BRAIN
 
-    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
-
- - start repo with old tag, push with new tag, run
-   "old" dgit to push again with new tag, push again with
-   old tag
-
-
- * Test all three new --quilt=unapplied|gbp|dpm
-
- * Want drs-quilt-gbp test.
-
- * Split quilt-gbp-build-modes into one with sbuild and one without
-
- * Add t-tstunt-parsechangelog to various tests
+  * Check archive allegedly supports split brain mode before running
+    off into the weeds and crashing out in the push.
 
 
 
 OTHER
 
+ * Better import format for complex .dscs
+
  * Provide --gpbpq[=:] options
 
  * Document --quilt=unapplied|gbp|dpm