X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=a8377a823c483bb938fcb398eab8db88503ba6ad;hp=7138c3b541e6f47093e50bfdfe56613713e7541c;hb=ada4118415b67675c6ba281c818d99dfd212d1b2;hpb=5a103560c1654caa2ceb955b32cfccc41c1f59c4

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 7138c3b5..a8377a82 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,26 +1,62 @@
 
-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
+
+    On push with split brain, do synthetic fast forward if as follows:
+       - find previous push (archive version, import, whatever
+          is result of fetch into the dgit remote tracking branch)
+       - find its version number
+       - find the tag we fetched during git_fetch_us in lrfetchrefs_f
+           [*] this may need us to arrange to fetch it
+           that is, find the DEP-14 tag
+       - find the corresponding dgit tag
+       - the dgit tag should be a descendant of the DEP-14 tag
+       - what we are pushing should be a descendant of the DEP-14 tag
+       - then we can make it also a descendant of the dgit tag
+          (make it: in dgit view only, in split brain mode)
+
+    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.
 
 
 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
 
-----------
 
-Provide --gpbpq[=:] options
-Document --quilt=unapplied|gbp|dpm
+Test that, where appropriate, maint view tags are pushed to dgit git repo
+
+
+ * Provide --gpbpq[=:] options
+
+ * Document --quilt=unapplied|gbp|dpm
+
+ * Mention new tag format in debian/changelog
+
+ * Mention new --quilt=* in debian/changelog
+
+ * Test all three new --quilt=unapplied|gbp|dpm
+
+ * Mention in-archive copy fix in debian/changelog
+
+ * Mention in changelog that:
+   Remove lrfetchrefs at end of fetch_from_archive, for tidyness
+
+ * Want drs-quilt-gbp test.
+
+ * Mention on changelog or docs that we no longer set a fetch spec for
+   the dgit remote (which doesn't really work anyway)
+
+ * Split quilt-gbp-build-modes into one with sbuild and one without
+
+ * Add t-tstunt-parsechangelog to various tests
+
+
+Check BTS