X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=0453a025fc94eafdd795c10aaa6d3ba532aeac35;hb=6e73b40874dcd924dd1f0091591cbc759070f276;hp=745147689aa14f16c6b745ae6c7570ed22f8e4b0;hpb=626570adb7708d465460d236c9da1b82a23c22b4;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 74514768..0453a025 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,28 +1,38 @@
 
-Tag rename unfinished business
-(things resulting from searching for `tag' where searching for
- `debiantag' wouldn't find them)
+ - 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
 
- - protocol version 4
-      implies ability to sign new tag (this is already there
-         so simply advertising version 4 will work)
-      needs also new ability to sign old-format tag in split
-         brain way
+    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.
 
- - many actual tests
 
- - other tag should be [dgit Maintainer-Tag quilt=$quilt-mode]
 
+OTHER
 
-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
- - rejecting push of same version with one tag when then the other
+ * Better import format for complex .dscs
 
-That, where appropriate, maint view tags are pushed to dgit git repo
+ * 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)
 
-Provide --gpbpq[=:] options
-Document --quilt=unapplied|gbp|dpm