X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=TODO.BRANCH;h=488765c842e2679b045087e6d2166581049b1a1f;hp=69efcae653abc316bd8f08c956ac0ad4bc2479f4;hb=25f10ec62284ba2b0a3c21ee9c61b9cdddaf9002;hpb=0c398a9586ef4807c3e6f2eec87173b2e081369a

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 69efcae6..488765c8 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -2,68 +2,44 @@
  - 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, if ff fixup mode enabled, check debian/changelog,
-       and maybe make fake merge, maybe in dgit view, maybe
-       elsewhere ?
 
+    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.
+
+
+TESTS
 
 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
+ * Test all three new --quilt=unapplied|gbp|dpm
 
- - 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
+OTHER
 
+ * Better import format for complex .dscs
 
  * 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
+CHECK BTS
 
 
- * IN ARCHIVE COPY Consider and implement fast-forward fixup
+CHANGELOG
 
-    - On fetch, check if specified git hash is ff from
-      existing dgit branch, the same way we do for constructed
-      dscs.  The .dsc tells us the git tree but not necessarily
-      the git hash.
-
-    ...ERR MAYBE...
-      
-         complicated there are many branches
-	       dgit-repos: refs/dgit/suite
-               archive dsc
-	       local; remotes/dgit/dgit/suite
-	                  must be ff
-			  may contain dscs
-               local: dgit/suite (not relevant to fetch)
-
-         archive dsc must always be regarded
-	       as ff from (or same as) dgit-repos
-               err depending on version number ?
-
-       this code is what needs changing
-       	} else {
-	    fail "git head (".lrref()."=$lastpush_hash) is not a ".
-		"descendant of archive's .dsc hash ($dsc_hash)";
-	}
-       it just needs to generate the fake merge and set $hash
-       the archive skew stuff is all fine with this
+ * Mention new tag format in debian/changelog
 
-        xxx actually, no, we need to stop from squashing our
-	lrref with + updates
+ * Mention new --quilt=* in debian/changelog
 
  * Mention in-archive copy fix in debian/changelog
 
- * Add in-archive-move test case
+ * 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)
 
- * Remove lrfetchrefs at end of fetch_from_archive, for tidyness