diff options
Diffstat (limited to 'dgit-maint-merge.7.pod')
| -rw-r--r-- | dgit-maint-merge.7.pod | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/dgit-maint-merge.7.pod b/dgit-maint-merge.7.pod index 19950d4..51b6a69 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 @@ -174,6 +174,7 @@ Now create I<debian/gbp.conf>: [import-orig] merge-mode = merge + merge = False =back @@ -193,7 +194,7 @@ Then we can import the upstream version: =over 4 - % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz + % gbp import-orig --merge --merge-mode=replace ../foo_1.2.2.orig.tar.xz =back @@ -381,7 +382,7 @@ Then, either =over 4 - % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz + % gbp import-orig ../foo_1.2.3.orig.tar.xz =back @@ -389,10 +390,12 @@ or if you have a working watch file =over 4 - % gbp import-orig --no-merge --uscan + % gbp import-orig --uscan =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. |