X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=TODO.BRANCH;h=7917383a6ce13acd9a788491a3d03e67ddce61ae;hb=ff3f1e25ff2f6ea88aa2fd89a1167361589e422d;hp=c1525226a22b92a8d73e3fbfcfdfe394b6fb7d22;hpb=b83b6f62fc7c4b473c7228b1293619389b284c5f;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index c1525226..7917383a 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,2 +1,50 @@
-Provide --gpbpq[=:] options
-Document --quilt=unapplied|gbp|dpm
+
+ - 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
+
+ * Add t-tstunt-parsechangelog to various tests
+
+
+
+OTHER
+
+ * 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)
+