From 22c53928460b993bddadb72e8fd51dd916e29cfc Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 24 Jul 2019 20:05:34 +0100 Subject: [PATCH] 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 --- dgit-maint-debrebase.7.pod | 4 +++- 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 4a0b5a52..d07a296f 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -181,7 +181,7 @@ Now create I: [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 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 19950d4e..3919fa8b 100644 --- a/dgit-maint-merge.7.pod +++ b/dgit-maint-merge.7.pod @@ -166,7 +166,7 @@ Now create I: [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. + =head2 Reviewing & merging the release It's a good idea to preview the merge of the new upstream release. -- 2.30.2