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>

diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index 4a0b5a52a3fec3b415f31320af91eacb8788dc9a..d07a296fe6af26cf48a0ecd3b0ef8093a058ffab 100644 (file)
--- 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 19950d4e7dd7e2ca03e7f97714ad7162ac99661e..3919fa8b5b73f23d4f29a0276dd3c92ea6f6ac78 100644 (file)
--- 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.