diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2020-02-20 22:24:07 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-02-20 22:24:07 -0700 |
| commit | b16d55213da9f96d71d50bfa78db3ccc561f46fd (patch) | |
| tree | 4f960f4526d2c36560c806c23699a2f9cef5fcbb /dgit-maint-merge.7.pod | |
| parent | b7fe58b0f4793dbd1eb9920e7233825c22b2928c (diff) | |
| parent | 4f41d991f1343912b5bd704be1e1cbb1ace52dba (diff) | |
Merge tag 'debian/9.10' into buster-bpo
dgit release 9.10 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 03 Feb 2020 01:48:30 AM MST
# gpg: using RSA key 559AE46C2D6B6D3265E7CBA1E3E3392348B50D39
# gpg: Can't check signature: No public key
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. |