X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=580cc2158cc42d70bf7856d376cc6f682a5fc950;hb=7888a212a8080ff8d625a163862b05106cbc1d18;hp=01d61ad48b0ae43ff946642ba288196c2562b384;hpb=6ce82b29dc651abd46de2cc36c07f41f02c159ed;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 01d61ad4..580cc215 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,30 +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 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
+ * Replace quilt patch generation with git-format-patch output
+   Honour (and strip) Gbp-Pq Topic and Gbp-Pq Name
+
+ * Fix up README.dsc-import to describe actual algorithm as implemented
 
  * Document --quilt=unapplied|gbp|dpm