TODO.BRANCH: Some things done

[dgit.git] / TODO.BRANCH

diff --git a/TODO.BRANCH b/TODO.BRANCH
index ba76b1687e2210da81f1b7335ce9e521845fdb0f..a81ca5581926ad3a2a03794b2cc737090b0ded42 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -2,9 +2,11 @@
  - 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 psuedomerge
+    on the user's HEAD.
 
 
 Want tests for
@@ -16,9 +18,6 @@ Want tests for
  - 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
-
-
  * Provide --gpbpq[=:] options
 
  * Document --quilt=unapplied|gbp|dpm
@@ -42,3 +41,6 @@ Test that, where appropriate, maint view tags are pushed to dgit git repo
  * Split quilt-gbp-build-modes into one with sbuild and one without
 
  * Add t-tstunt-parsechangelog to various tests
+
+
+Check BTS