X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=141a3aab22f2257a0b2b0f28f6490d1ed48216cc;hb=a840640baebaa11079b64be2ae5f89a111648985;hp=a8377a823c483bb938fcb398eab8db88503ba6ad;hpb=d9b4c302c1e04e9047b920b2bc40896479fdacb5;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index a8377a82..141a3aab 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,62 +1,34 @@
 
- - 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
+SPLIT BRAIN
 
-    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)
+  * Check archive allegedly supports split brain mode before running
+    off into the weeds and crashing out in the push.
 
-    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
+OTHER
 
- - start repo with old tag, push with new tag, run
-   "old" dgit to push again with new tag, push again with
-   old tag
+ * Better import format for complex .dscs
 
- - 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
 
+CHECK BTS
 
- * Provide --gpbpq[=:] options
 
- * Document --quilt=unapplied|gbp|dpm
+CHANGELOG
 
  * 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