X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=0951402cbd7c231b66690dc3303e58cfe27a9552;hp=7d39b29c9506d4c1672e65e7eca63ed95b8704ea;hb=cc9deb8e711981e5b7e980fca84f9b7ca07d4b39;hpb=9103f4a18a893971b6ab8fab4c1ac4c98729eecb

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 7d39b29c..0951402c 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,26 +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.
-
-
-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
+ * 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