diff options
| -rw-r--r-- | TODO.BRANCH | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/TODO.BRANCH b/TODO.BRANCH index a8377a8..a81ca55 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 |