X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=34ea6ce84f8642f1def536cb65c4ec641475af69;hb=b2d9f8686c2c0be679cc2f5331cd316c76aa4694;hp=01d61ad48b0ae43ff946642ba288196c2562b384;hpb=6ce82b29dc651abd46de2cc36c07f41f02c159ed;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 01d61ad4..34ea6ce8 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,31 +1,6 @@
 
- - 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
-
-    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
-
-
-
 OTHER
 
- * Provide --gpbpq[=:] options
-
  * Document --quilt=unapplied|gbp|dpm