Split brain pseudomerge: Test $overwrite_version for definedness

[dgit.git] / TODO.BRANCH

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 01d61ad48b0ae43ff946642ba288196c2562b384..0453a025fc94eafdd795c10aaa6d3ba532aeac35 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -5,25 +5,15 @@
 
     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
+    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
-
-
 
 OTHER
 
+ * Better import format for complex .dscs
+
  * Provide --gpbpq[=:] options
 
  * Document --quilt=unapplied|gbp|dpm