Overwrite: Provide --overwrite=VERSION option

[dgit.git] / TODO.BRANCH

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 7d39b29c9506d4c1672e65e7eca63ed95b8704ea..141a3aab22f2257a0b2b0f28f6490d1ed48216cc 100644 (file)
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,14 +1,4 @@
 
- - 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
-
-    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.
-
-
 SPLIT BRAIN
 
   * Check archive allegedly supports split brain mode before running