X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=0951402cbd7c231b66690dc3303e58cfe27a9552;hb=573bb223c92c66b367114a0d1238be35013cdba2;hp=a8f5deb5230eb947eea3dcd55f033e315dd4003c;hpb=57fe9181f58d6a311dd105283eff2be055de26b6;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index a8f5deb5..0951402c 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,32 +1,15 @@
 
- - 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.
-
-
-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
 
- * Better import format for complex .dscs
+ * Replace quilt patch generation with git-format-patch output
+   Honour (and strip) Gbp-Pq Topic and Gbp-Pq Name
 
  * Provide --gpbpq[=:] options
+ * When invoking gbp pq internally, use --color=off
+ * When invoking gbp pq during import, redirect stderr
+   and print only on failure
+
+ * Fix up README.dsc-import to describe actual algorithm as implemented
 
  * Document --quilt=unapplied|gbp|dpm