X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=34ea6ce84f8642f1def536cb65c4ec641475af69;hp=0453a025fc94eafdd795c10aaa6d3ba532aeac35;hb=b2d9f8686c2c0be679cc2f5331cd316c76aa4694;hpb=1d1eb3e0ae33d5fb775dcafa62680189e8e43fd7;ds=sidebyside

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 0453a025..34ea6ce8 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,21 +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 pseudomerge
-    on the user's HEAD.
-
-
-
 OTHER
 
- * Better import format for complex .dscs
-
- * Provide --gpbpq[=:] options
-
  * Document --quilt=unapplied|gbp|dpm