X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=a81ca5581926ad3a2a03794b2cc737090b0ded42;hb=63f4c0cbcbc99f9a62ae542fdcf0c297fc3e58c3;hp=a8377a823c483bb938fcb398eab8db88503ba6ad;hpb=d9b4c302c1e04e9047b920b2bc40896479fdacb5;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index a8377a82..a81ca558 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -3,19 +3,6 @@
     this should not depend entirely on quilt mode
     but will always be needed if quiltmode_splitbrain
 
-    On push with split brain, do synthetic fast forward if as follows:
-       - find previous push (archive version, import, whatever
-          is result of fetch into the dgit remote tracking branch)
-       - find its version number
-       - find the tag we fetched during git_fetch_us in lrfetchrefs_f
-           [*] this may need us to arrange to fetch it
-           that is, find the DEP-14 tag
-       - find the corresponding dgit tag
-       - the dgit tag should be a descendant of the DEP-14 tag
-       - what we are pushing should be a descendant of the DEP-14 tag
-       - then we can make it also a descendant of the dgit tag
-          (make it: in dgit view only, in split brain mode)
-
     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
@@ -31,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