X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=0d863169cdb6acb1e88da1caa3acf79a05289ce4;hp=7d39b29c9506d4c1672e65e7eca63ed95b8704ea;hb=430c0a2bccc7427a981310da73061d2d4fe52bab;hpb=9103f4a18a893971b6ab8fab4c1ac4c98729eecb

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 7d39b29c..0d863169 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,44 +1,10 @@
 
- - 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.
-
-
-SPLIT BRAIN
-
-  * 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
-
 
 CHECK BTS
 
 
 CHANGELOG
 
- * Mention new tag format in debian/changelog
-
- * Mention new --quilt=* in debian/changelog
-
- * 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)