TODO.BRANCH: Update following split tag work

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 0b28a74104d6885aa2fe68f68bae9e1cc903016d..8279dafe532f84791c14c8a41dc979277f641f42 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -2,16 +2,6 @@ Tag rename unfinished business
 (things resulting from searching for `tag' where searching for
  `debiantag' wouldn't find them)
 
- - 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
-
- - many actual tests
-
- - other tag should be [dgit Maintainer-Tag quilt=$quilt-mode]
-
  - 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
@@ -26,11 +16,14 @@ Tag rename unfinished business
 
 
 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
 
+
 Test that, where appropriate, maint view tags are pushed to dgit git repo
 
 
@@ -38,11 +31,11 @@ Test that, where appropriate, maint view tags are pushed to dgit git repo
 
  * Document --quilt=unapplied|gbp|dpm
 
- * Mention new --quilt=* in debian/changelog
+ * Mention new tag format in debian/changelog
 
- * Mention in-archive copy fix in debian/changelog
+ * Mention new --quilt=* in debian/changelog
 
- * Test --quilt=*
+ * Test all three new --quilt=unapplied|gbp|dpm
 
 
  * IN ARCHIVE COPY Consider and implement fast-forward fixup
@@ -77,5 +70,7 @@ Test that, where appropriate, maint view tags are pushed to dgit git repo
         xxx actually, no, we need to stop from squashing our
        lrref with + updates
 
+ * Mention in-archive copy fix in debian/changelog
+
  * Add in-archive-move test case