X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=TODO.BRANCH;h=a8377a823c483bb938fcb398eab8db88503ba6ad;hb=be01dc41afcebe1f3931c7137fdbacdb0966c2ae;hp=ba76b1687e2210da81f1b7335ce9e521845fdb0f;hpb=d655b298e3ac4ecba08885ab8c96cdbafc83c155;p=dgit.git

diff --git a/TODO.BRANCH b/TODO.BRANCH
index ba76b168..a8377a82 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -2,9 +2,24 @@
  - 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 ?
+
+    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
+    on the user's HEAD.
 
 
 Want tests for
@@ -42,3 +57,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