diff options
Diffstat (limited to 'po4a/dgit-maint-merge_7.pot')
| -rw-r--r-- | po4a/dgit-maint-merge_7.pot | 382 |
1 files changed, 209 insertions, 173 deletions
diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index 1dbb682..295e820 100644 --- a/po4a/dgit-maint-merge_7.pot +++ b/po4a/dgit-maint-merge_7.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 01:04+0100\n" +"POT-Creation-Date: 2024-04-11 22:39+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -21,36 +21,38 @@ msgstr "" #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1 -#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1 +#: ../git-debpush.1.pod:1 #, no-wrap msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:464 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450 +#: ../dgit.1:299 ../dgit-maint-merge.7.pod:468 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455 +#: ../dgit.1:300 ../dgit-maint-merge.7.pod:473 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 -#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126 -#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601 -#: ../git-debrebase.5.pod:678 +#: ../dgit.1:1694 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125 +#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:325 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:643 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -59,18 +61,12 @@ msgstr "" #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5 -#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5 +#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 msgid "INTRODUCTION" msgstr "" -#. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138 -msgid "dgit(1), dgit(7)" -msgstr "" - #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484 +#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:502 #, no-wrap msgid "" " % dgit pull\n" @@ -147,9 +143,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335 -#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:321 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:347 +#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:362 msgid "When upstream tags releases in git" msgstr "" @@ -216,8 +212,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:383 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:420 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" " % git deborig\n" @@ -261,21 +257,73 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343 -#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137 -#: ../dgit-maint-debrebase.7.pod:329 +#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137 +msgid "Using untagged upstream commits" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141 +msgid "" +"Sometimes upstream does not tag their releases, or you want to package an " +"unreleased git snapshot. In such a case you can create your own upstream " +"release tag, of the form B<upstream/>I<ver>, where I<ver> is the upstream " +"version you plan to put in I<debian/changelog>. The B<upstream/> prefix " +"ensures that your tag will not clash with any tags upstream later creates." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148 +msgid "" +"For example, suppose that the latest upstream release is 1.2.2 and you want " +"to package git commit ab34c21 which was made on 2013-12-11. A common " +"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 " +"and so you could use" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155 +#, no-wrap +msgid "" +" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159 +msgid "to obtain a release tag, and then proceed as above." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:147 +msgid "" +"One can generate such a versioned tag using git show's --pretty option. e." +"g.:" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-merge.7.pod:151 ../dgit-maint-debrebase.7.pod:165 +#, no-wrap +msgid "" +" % git tag -s upstream/$(git show --date=format:%Y%m%d --pretty=format:\"1.2.2+git%cd.%h\" --quiet upstream/main) upstream/main\n" +"\n" +msgstr "" + +#. type: =head3 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:359 +#: ../dgit-maint-merge.7.pod:451 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-debrebase.7.pod:374 msgid "When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:125 +#: ../dgit-maint-merge.7.pod:159 msgid "" "We need a virtual upstream branch with virtual release tags. gbp-import-" "orig(1) can manage this for us. To begin" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145 +#: ../dgit-maint-merge.7.pod:164 #, no-wrap msgid "" " % mkdir foo\n" @@ -285,23 +333,23 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151 +#: ../dgit-maint-merge.7.pod:170 msgid "Now create I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155 +#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:216 #, no-wrap msgid "" " [DEFAULT]\n" " upstream-branch = upstream\n" " debian-branch = master\n" -" upstream-tag = %(version)s\n" +" upstream-tag = upstream/%(version)s\n" "\n" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160 +#: ../dgit-maint-merge.7.pod:179 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " sign-tags = True\n" @@ -311,21 +359,22 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164 +#: ../dgit-maint-merge.7.pod:183 #, no-wrap msgid "" " [import-orig]\n" " merge-mode = merge\n" +" merge = False\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169 +#: ../dgit-maint-merge.7.pod:189 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173 +#: ../dgit-maint-merge.7.pod:193 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -337,20 +386,20 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +#: ../dgit-maint-merge.7.pod:201 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185 +#: ../dgit-maint-merge.7.pod:205 #, no-wrap msgid "" -" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" +" % gbp import-orig --merge --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189 +#: ../dgit-maint-merge.7.pod:209 msgid "" "Our upstream branch cannot be pushed to B<dgit-repos>, but since we will " "need it whenever we import a new upstream version, we must push it " @@ -358,7 +407,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:199 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -367,31 +416,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:185 +#: ../dgit-maint-merge.7.pod:220 msgid "" "You are now ready to proceed as above, making commits to both the upstream " "source and the I<debian/> directory." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207 +#: ../dgit-maint-merge.7.pod:223 ../dgit-maint-debrebase.7.pod:243 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209 +#: ../dgit-maint-merge.7.pod:225 ../dgit-maint-debrebase.7.pod:245 msgid "" "This section explains how to convert an existing Debian package to this " "workflow. It should be skipped when debianising a new package." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:193 +#: ../dgit-maint-merge.7.pod:228 msgid "No existing git history" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:197 +#: ../dgit-maint-merge.7.pod:232 #, no-wrap msgid "" " % dgit clone foo\n" @@ -401,19 +450,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:203 +#: ../dgit-maint-merge.7.pod:238 msgid "Existing git history using another workflow" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:205 +#: ../dgit-maint-merge.7.pod:240 msgid "" "First, if you don't already have the git history locally, clone it, and " "obtain the corresponding orig.tar from the archive:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:210 +#: ../dgit-maint-merge.7.pod:245 #, no-wrap msgid "" " % git clone git.debian.org:collab-maint/foo\n" @@ -423,12 +472,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:216 +#: ../dgit-maint-merge.7.pod:251 msgid "Now dump any existing patch queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:220 +#: ../dgit-maint-merge.7.pod:255 #, no-wrap msgid "" " % git rm -rf debian/patches\n" @@ -437,12 +486,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:225 +#: ../dgit-maint-merge.7.pod:260 msgid "Then make new upstream tags available:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240 +#: ../dgit-maint-merge.7.pod:264 ../dgit-maint-debrebase.7.pod:276 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -450,12 +499,12 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:233 +#: ../dgit-maint-merge.7.pod:268 msgid "dgit-test dpkg-source-ignores begin" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:235 +#: ../dgit-maint-merge.7.pod:270 msgid "" "Now you simply need to ensure that your git HEAD is dgit-compatible, i.e., " "it is exactly what you would get if you ran B<dpkg-buildpackage -i'(?:^|/)\\." @@ -463,155 +512,123 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:240 +#: ../dgit-maint-merge.7.pod:275 msgid "dgit-test dpkg-source-ignores end" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:289 +#: ../dgit-maint-merge.7.pod:277 ../dgit-maint-debrebase.7.pod:330 msgid "" "To achieve this, you might need to delete I<debian/source/local-options>. " "One way to have dgit check your progress is to run B<dgit build-source>." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:246 +#: ../dgit-maint-merge.7.pod:281 msgid "" -"The first dgit push will require I<--overwrite>. If this is the first ever " -"dgit push of the package, consider passing I<--deliberately-not-fast-" -"forward> instead of I<--overwrite>. This avoids introducing a new origin " -"commit into your git history. (This origin commit would represent the most " -"recent non-dgit upload of the package, but this should already be " +"The first dgit push will require I<--trust-changelog>. If this is the first " +"ever dgit push of the package, consider passing I<--deliberately-not-fast-" +"forward> instead of I<--trust-changelog>. This avoids introducing a new " +"origin commit into your git history. (This origin commit would represent " +"the most recent non-dgit upload of the package, but this should already be " "represented in your git history.)" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:253 -msgid "SOURCE PACKAGE CONFIGURATION" +#: ../dgit-maint-merge.7.pod:288 +msgid "SOURCE PACKAGE AND GIT CONFIGURATION" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:255 -msgid "debian/source/options" +#: ../dgit-maint-merge.7.pod:290 +msgid "dgit configuration" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:257 +#: ../dgit-maint-merge.7.pod:292 msgid "" -"We set some source package options such that dgit can transparently handle " -"the \"dropping\" and \"refreshing\" of changes to the upstream source:" +"We must tell dgit not to try to maintain a linear queue of patches to the " +"upstream source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:263 +#: ../dgit-maint-merge.7.pod:297 #, no-wrap msgid "" -" single-debian-patch\n" -" auto-commit\n" +" git config dgit.default.quilt-mode single\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:268 +#: ../dgit-maint-merge.7.pod:301 msgid "" -"You don't need to create this file if you are using the version 1.0 source " -"package format." +"This command should be executed in each git clone of this package, including " +"your co-maintainer's. Don't set it more globally, because it is not a good " +"default for working on Debian source packages in general." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:271 -msgid "Sample text for debian/source/patch-header" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:273 -msgid "" -"It is a good idea to explain how a user can obtain a breakdown of the " -"changes to the upstream source:" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:278 -msgid "" -"The Debian packaging of foo is maintained in git, using the merging workflow " -"described in dgit-maint-merge(7). There isn't a patch queue that can be " -"represented as a quilt series." +#: ../dgit-maint-merge.7.pod:305 +msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:282 +#: ../dgit-maint-merge.7.pod:307 msgid "" -"A detailed breakdown of the changes is available from their canonical " -"representation - git commits in the packaging repository. For example, to " -"see the changes made by the Debian maintainer in the first upload of " -"upstream version 1.2.3, you could use:" +"We set a source package option to help dpkg handle changes to the upstream " +"source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:290 +#: ../dgit-maint-merge.7.pod:313 #, no-wrap msgid "" -" % git clone https://git.dgit.debian.org/foo\n" -" % cd foo\n" -" % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'\n" +" auto-commit\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:296 -msgid "" -"(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:299 -msgid "A single combined diff, containing all the changes, follows." -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:303 -msgid "" -"If you are using the version 1.0 source package format, this text should be " -"added to README.source instead. The version 1.0 source package format " -"ignores debian/source/patch-header." -msgstr "" - -#. type: textblock -#: ../dgit-maint-merge.7.pod:307 +#: ../dgit-maint-merge.7.pod:317 msgid "" -"If you're using the version 3.0 (quilt) source package format, you could add " -"this text to README.source instead of debian/source/patch-header, but this " -"might distract from more important information present in README.source." +"You don't need to create this file if you are using the version 1.0 source " +"package format." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:436 +#: ../dgit-maint-merge.7.pod:320 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:314 +#: ../dgit-maint-merge.7.pod:322 msgid "" "Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit cowbuilder>, " -"B<dgit push-source>, and B<dgit push> as detailed in dgit(1). If any " +"B<dgit push-source>, and B<dgit push-built> as detailed in dgit(1). If any " "command fails, dgit will provide a carefully-worded error message explaining " "what you should do. If it's not clear, file a bug against dgit. Remember " "to pass I<--new> for the first upload." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:320 +#: ../dgit-maint-merge.7.pod:328 +msgid "" +"If you want to upload with git-debpush(1), for the first upload you should " +"pass the B<--quilt=single> quilt mode option (see git-debpush(1))." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:332 msgid "" -"As an alternative to B<dgit build> and friends, you can use a tool like " +"As another alternative to B<dgit build> and friends, you can use a tool like " "gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has " -"exactly the contents of the source package. gitpkg(1) is highly " +"exactly the contents of the source package. gitpkg(1) is highly " "configurable, and one dgit user reports using it to produce and test " "multiple source packages, from different branches corresponding to each of " "the current Debian suites." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:327 +#: ../dgit-maint-merge.7.pod:339 msgid "" "If you want to skip dgit's checks while iterating on a problem with the " "package build (for example, you don't want to commit your changes to git), " @@ -619,25 +636,33 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:331 +#: ../dgit-maint-merge.7.pod:343 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319 +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325 +#: ../dgit-maint-merge.7.pod:351 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" -" % git remote update\n" +" % git fetch --tags upstream\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331 +#: ../dgit-maint-merge.7.pod:355 ../dgit-maint-debrebase.7.pod:370 +msgid "" +"If you want to package an untagged upstream commit (because upstream does " +"not tag releases or because you want to package an upstream development " +"snapshot), see \"Using untagged upstream commits\" above." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:361 ../dgit-maint-debrebase.7.pod:376 msgid "" "You will need the I<debian/gbp.conf> from \"When upstream releases only " "tarballs\", above. You will also need your upstream branch. Above, we " @@ -646,38 +671,43 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" -" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" +" % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344 +#: ../dgit-maint-merge.7.pod:374 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:348 +#: ../dgit-maint-merge.7.pod:378 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" -" % gbp import-orig --no-merge --uscan\n" +" % gbp import-orig --uscan\n" "\n" msgstr "" +#. type: textblock +#: ../dgit-maint-merge.7.pod:382 +msgid "In the following, replace I<1.2.3> with I<upstream/1.2.3>." +msgstr "" + #. type: =head2 -#: ../dgit-maint-merge.7.pod:366 +#: ../dgit-maint-merge.7.pod:384 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:368 +#: ../dgit-maint-merge.7.pod:386 msgid "" "It's a good idea to preview the merge of the new upstream release. First, " "just check for any new or deleted files that may need accounting for in your " @@ -685,20 +715,20 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:374 +#: ../dgit-maint-merge.7.pod:392 #, no-wrap msgid "" -" % git diff --stat master..1.2.3 -- . ':!debian'\n" +" % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:378 +#: ../dgit-maint-merge.7.pod:396 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:382 +#: ../dgit-maint-merge.7.pod:400 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -706,12 +736,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:386 +#: ../dgit-maint-merge.7.pod:404 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:390 +#: ../dgit-maint-merge.7.pod:408 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -721,7 +751,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:414 ../dgit-maint-debrebase.7.pod:423 msgid "" "If you obtained a tarball from upstream, you are ready to try a build. If " "you merged a git tag from upstream, you will first need to generate a " @@ -729,17 +759,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461 +#: ../dgit-maint-merge.7.pod:424 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:410 +#: ../dgit-maint-merge.7.pod:428 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:414 +#: ../dgit-maint-merge.7.pod:432 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -752,7 +782,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:423 +#: ../dgit-maint-merge.7.pod:441 msgid "" "Before merging the new 1.2.3+dfsg tag to master, you should first determine " "whether it would be legally dangerous for the non-free material to be " @@ -760,7 +790,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:428 +#: ../dgit-maint-merge.7.pod:446 msgid "" "If it would be dangerous, there is a big problem; in this case please " "consult your archive administrators (for Debian this is the dgit " @@ -769,7 +799,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521 +#: ../dgit-maint-merge.7.pod:453 ../dgit-maint-debrebase.7.pod:591 msgid "" "The easiest way to handle this is to add a B<Files-Excluded> field to " "I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. " @@ -778,40 +808,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:440 +#: ../dgit-maint-merge.7.pod:458 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:442 +#: ../dgit-maint-merge.7.pod:460 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:448 +#: ../dgit-maint-merge.7.pod:466 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:452 +#: ../dgit-maint-merge.7.pod:470 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:457 +#: ../dgit-maint-merge.7.pod:475 msgid "" "Push the branch somewhere and ask upstream to merge it, or use git-format-" "patch(1) or git-request-pull(1)." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:462 +#: ../dgit-maint-merge.7.pod:480 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:466 +#: ../dgit-maint-merge.7.pod:484 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -825,7 +855,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:476 +#: ../dgit-maint-merge.7.pod:494 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -833,26 +863,32 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:526 +#: ../dgit-maint-merge.7.pod:498 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:488 +#: ../dgit-maint-merge.7.pod:506 msgid "" "Alternatively, you can apply the NMU diff to your repository. The next push " -"will then require I<--overwrite>." +"will then require I<--trust-changelog>." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:511 +msgid "dgit(1), dgit(7), gitrevisions(7)" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:726 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143 +#: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144 +#: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728 +#: ../dgit-maint-merge.7.pod:515 ../dgit-maint-debrebase.7.pod:798 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " |