X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=141a3aab22f2257a0b2b0f28f6490d1ed48216cc;hb=a840640baebaa11079b64be2ae5f89a111648985;hp=0453a025fc94eafdd795c10aaa6d3ba532aeac35;hpb=1d1eb3e0ae33d5fb775dcafa62680189e8e43fd7;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 0453a025..141a3aab 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -1,12 +1,8 @@
 
- - 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
+    off into the weeds and crashing out in the push.