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
on the user's HEAD.
+TESTS
+
Want tests for
- start repo with old tag, push with new tag, run
"old" dgit to push again with new tag, push again with
old tag
- - rejecting push of same version with one tag when then the other
+
+ * Test all three new --quilt=unapplied|gbp|dpm
-Test that, where appropriate, maint view tags are pushed to dgit git repo
+OTHER
* Provide --gpbpq[=:] options
* Document --quilt=unapplied|gbp|dpm
+
+CHECK BTS
+
+
+CHANGELOG
+
* Mention new tag format in debian/changelog
* Mention new --quilt=* in debian/changelog
- * Test all three new --quilt=unapplied|gbp|dpm
-
* Mention in-archive copy fix in debian/changelog
* Mention in changelog that:
Remove lrfetchrefs at end of fetch_from_archive, for tidyness
- * Want drs-quilt-gbp test.
-
* Mention on changelog or docs that we no longer set a fetch spec for
the dgit remote (which doesn't really work anyway)
- * Split quilt-gbp-build-modes into one with sbuild and one without
-
- * Add t-tstunt-parsechangelog to various tests
-
-
-Check BTS
~ianmdlvl / dgit.git / blobdiff