diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-20 11:56:43 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2021-02-12 12:47:45 +0000 |
commit | cd82d4ac2910c5dc9a336009ab8a26f88bb7961f (patch) | |
tree | c9750d16f443622d564e04df46a66aa8edb5596a | |
parent | 35f1cc3f7c6bec8a59b897ab624a5d850df85561 (diff) |
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>
-rw-r--r-- | dgit-maint-debrebase.7.pod | 4 | ||||
-rw-r--r-- | dgit-maint-gbp.7.pod | 3 | ||||
-rw-r--r-- | dgit-maint-merge.7.pod | 16 |
3 files changed, 17 insertions, 6 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index fdbf2e8..b3700a4 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -486,6 +486,10 @@ fast-forwarding from the history on B<dgit-repos>. In such cases you will have to pass I<--overwrite> to dgit. git-debrebase will normally tell you if this will be needed. +If you want to upload with git-debpush(1), for the first upload you +should pass the B<--quilt=linear> quilt mode option (see +git-debpush(1)). + Right before uploading, if you did not just already do so, you might want to have git-debrebase(1) shuffle your branch such that the Debian delta queue appears right at the tip of the branch you will push: diff --git a/dgit-maint-gbp.7.pod b/dgit-maint-gbp.7.pod index b8abd66..1988a31 100644 --- a/dgit-maint-gbp.7.pod +++ b/dgit-maint-gbp.7.pod @@ -127,6 +127,9 @@ history. (This origin commit would represent the most recent non-dgit upload of the package, but this should already be represented in your git history.) +Alternatively, you can use git-debpush(1). For the first upload you +should pass the B<--gbp> quilt mode option (see git-debpush(1)). + =head1 INCORPORATING NMUS B<dgit pull> can't yet incorporate NMUs into patches-unapplied gbp diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 51b6a69..ddf37aa 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -344,12 +344,16 @@ dgit(1). If any command fails, dgit will provide a carefully-worded error message explaining what you should do. If it's not clear, file a bug against dgit. Remember to pass I<--new> for the first upload. -As an alternative to B<dgit build> and friends, you can use a tool -like gitpkg(1). This works because like dgit, gitpkg(1) enforces that -HEAD has exactly the contents of the source package. gitpkg(1) is -highly configurable, and one dgit user reports using it to produce and -test multiple source packages, from different branches corresponding -to each of the current Debian suites. +If you want to upload with git-debpush(1), for the first upload you +should pass the B<--quilt=smash> quilt mode option (see +git-debpush(1)). + +As another alternative to B<dgit build> and friends, you can use a +tool like gitpkg(1). This works because like dgit, gitpkg(1) enforces +that HEAD has exactly the contents of the source package. gitpkg(1) +is highly configurable, and one dgit user reports using it to produce +and test multiple source packages, from different branches +corresponding to each of the current Debian suites. If you want to skip dgit's checks while iterating on a problem with the package build (for example, you don't want to commit your changes |