X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=e342f1afc64f8df60e1d01dc25041c5f07ae9308;hp=0b28a74104d6885aa2fe68f68bae9e1cc903016d;hb=4148272808e1c37f1077aa6a42e6057378730fa3;hpb=e0b5aa648f47d5ec6f3368b23f4aeada81f45546;ds=sidebyside

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 0b28a741..e342f1af 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,16 +1,3 @@
-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
@@ -19,18 +6,16 @@ Tag rename unfinished business
        and maybe make fake merge, maybe in dgit view, maybe
        elsewhere ?
 
- - there is some confusion between $split_brain (did we actually
-   generate any commits) and quiltmode_splitbrain (might we have done,
-   including in previous pushes); search for $split_brain and check
-   that use sites are correct
-
 
 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 +23,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 +62,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