dgit-maint-*(7): Advice for git-debpush users dgit-maint-native(7) doesn't need updating because git-debpush(1) is clear that quilt mode options are required only for non-native packages. This commit leaves `dgit push{,-source}` as the first choice, with git-debpush(1) given as an alternative. We might want to change that in the future, but for the time being this makes sense. Closes: #932520 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
d-m-{merge,debrebase}(7): Set 'merge' in gbp.conf This enables simplifying runes which are more frequently to be typed. 'merge-mode' no longer need be set since in the only case where the manpages recommend allowing `gbp import-orig` to perform a merge, a different merge mode is required (and specified in that rune). This is part of #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
d-m-{merge,debrebase}(7): Use an 'upstream/' tag prefix in gbp.conf This is a useful convention to distinguish actual upstream tags from upstream tarball-representing tags created by the Debian package maintainer. Note that use of this convention is already recommended in section "Using untagged upstream commits". This is part of #932954. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-{merge,debrebase}(7): Use git fetch --tags upstream We recommend using a remote called 'upstream' and so we can recommend a command which will be faster and less likely to error out. Closes: #939679 Suggested-by: Ian Jackson <ijackson@chiark.greenend.org.uk> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-{merge,debrebase}(7): Use git fetch --all --tags `git remote update` doesn't fetch tags unless remote branches include the commits at which those tags point. Thus, if upstream pushes their release tag but fails to push their master branch, `git remote update` will not fetch the release tag. I've been in this situation more than once when following the workflows detailed in these manpages, so let's just recommend a command which will definitely try to fetch the latest release tag. Closes: #939504 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name> Acked-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit-maint-{merge,debrebase}(7): Using untagged upstream commits Closes: #930964 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-{merge,debrebase}(7): Suggest --name-status --diff-filter This is better than just --stat for finding new and deleted files in a new upstream release, which may need accounting for in d/copyright. Closes: #930956 Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
manpages: add references to pbuilder and cowbuilder Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
manpages: alioth->salsa Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge(7): recommend dgit-maint-debrebase(7) Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge(7): debian/source/patch-header not in format 1.0 Suggested-by: Matthew Vernon <matthew@debian.org> Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge(7): Fix pod syntax This was broken in b405f072572fd2e4e2acaa94562b697bc639b86d dgit-maint-merge(7): Include instructions to clone existing repo Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
dgit-*(7): --deliberately-not-fast-forward for first dgit push Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge(7): Include instructions to clone existing repo Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge(7): Mandate pushing upstream branch to alioth In the case where we are using gbp-import-orig(1) to maintain a virtual upstream branch, we must push that branch somewhere. It is needed whenever we import a new upstream release. Thanks to Johannes Schauer for pointing out that the manpage previously said that pushing to alioth is always optional. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge(7): Restructure "NEW UPSTREAM RELEASES" Previously, some instructions applicable and needed whether or not upstream tags releases in git were given only for the case where upstream tags releases in git. Thanks Johannes Schauer for noticing this problem. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge(7): Configure --merge-mode for gbp-import-orig(1) For 3.0 (quilt) source packages, gbp-import-orig(1) defaults to --merge-mode=replace, which does the wrong thing for patches-applied repositories (see gbp-import-orig(1)). Note that we do override this when importing the first upstream version. This is needed because git-merge(1) will refuse to merge unrelated histories. Thanks to Johannes Schauer for reporting the problem. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit-maint-merge(7): Create an empty branch for upstream source Thanks to Johannes Schauer for finding the problem. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
dgit: dpkg_source_ignores: Exclude the right set of things Change the dpkg-source -i argument to exclude exactly the right set of things. (Sadly this is not a simple rune.) Previously we might exclude `foo.git', for example ! Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
test suite: dpkgsourceignores-docs: Check dgit-maint-merge(7) -i -I rune Check that the rune we document is the same as dgit actually uses. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>