changelog: Mention #833025 re --quilt=

[dgit.git] / TODO.BRANCH

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 0453a025fc94eafdd795c10aaa6d3ba532aeac35..0d863169cdb6acb1e88da1caa3acf79a05289ce4 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,38 +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.
-
-
-
-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)