- - there is some confusion between $split_brain (did we actually
- generate any commits) and quiltmode_splitbrain (might we have done,
- including in previous pushes); search for $split_brain and check
- that use sites are correct
+ 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.