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

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 1008708c..488765c8 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -2,37 +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
 
+
+CHECK BTS
+
+
+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)