diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-24 20:05:34 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2020-02-02 16:46:11 +0000 |
| commit | 22c53928460b993bddadb72e8fd51dd916e29cfc (patch) | |
| tree | 3e6b16899dc347b08b0ec7eb6b1c7a26802744cf | |
| parent | 3c8aa06111f498377f39f0f0d34d17fe7e187448 (diff) | |
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>
| -rw-r--r-- | dgit-maint-debrebase.7.pod | 4 | ||||
| -rw-r--r-- | dgit-maint-merge.7.pod | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index 4a0b5a5..d07a296 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -181,7 +181,7 @@ Now create I<debian/gbp.conf>: [DEFAULT] upstream-branch = upstream debian-branch = master - upstream-tag = %(version)s + upstream-tag = upstream/%(version)s sign-tags = True pristine-tar = False @@ -392,6 +392,8 @@ or if you have a working watch file =back +replacing I<1.2.3> with I<upstream/1.2.3> if you imported a tarball. + This invocation of git-debrebase(1) involves a git rebase. You may need to resolve conflicts if the Debian delta queue does not apply cleanly to the new upstream source. diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 19950d4..3919fa8 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -166,7 +166,7 @@ Now create I<debian/gbp.conf>: [DEFAULT] upstream-branch = upstream debian-branch = master - upstream-tag = %(version)s + upstream-tag = upstream/%(version)s sign-tags = True pristine-tar = False @@ -393,6 +393,8 @@ or if you have a working watch file =back +In the following, replace I<1.2.3> with I<upstream/1.2.3>. + =head2 Reviewing & merging the release It's a good idea to preview the merge of the new upstream release. |