chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix spelling of "pseudo"
[dgit.git]
/
TODO.BRANCH
diff --git
a/TODO.BRANCH
b/TODO.BRANCH
index c32550d06060e47bc08f3214bf4f8e86ee8d5201..a8f5deb5230eb947eea3dcd55f033e315dd4003c 100644
(file)
--- a/
TODO.BRANCH
+++ b/
TODO.BRANCH
@@
-2,10
+2,14
@@
- 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
- 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 ?
+ 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 pseudomerge
+ on the user's HEAD.
+
+
+TESTS
Want tests for
Want tests for
@@
-13,22
+17,34
@@
Want tests for
"old" dgit to push again with new tag, push again with
old tag
"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
+
+ * Better import format for complex .dscs
* Provide --gpbpq[=:] options
* Document --quilt=unapplied|gbp|dpm
* Provide --gpbpq[=:] options
* Document --quilt=unapplied|gbp|dpm
+
+CHECK BTS
+
+
+CHANGELOG
+
* Mention new tag format in debian/changelog
* Mention new --quilt=* in debian/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-archive copy fix in debian/changelog
- * Remove lrfetchrefs at end of fetch_from_archive, for tidyness
+ * Mention in changelog that:
+ Remove lrfetchrefs at end of fetch_from_archive, for tidyness
+
+ * Mention on changelog or docs that we no longer set a fetch spec for
+ the dgit remote (which doesn't really work anyway)
+