diff options
Diffstat (limited to 'po4a/dgit-maint-merge_7.pot')
-rw-r--r-- | po4a/dgit-maint-merge_7.pot | 222 |
1 files changed, 114 insertions, 108 deletions
diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index 7bd423c..b973a7a 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: 2019-09-08 20:11+0100\n" +"POT-Creation-Date: 2020-02-02 16:50+0000\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" @@ -28,31 +28,31 @@ msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476 +#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480 +#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485 +#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1575 ../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:521 ../dgit-maint-gbp.7.pod:136 -#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352 -#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134 -#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678 -#: ../git-debpush.1.pod:254 +#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136 +#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678 +#: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" msgstr "" @@ -67,12 +67,12 @@ msgstr "" #. type: textblock #: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:523 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-maint-merge.7.pod:526 ../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:514 +#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:517 #, no-wrap msgid "" " % dgit pull\n" @@ -149,9 +149,9 @@ msgid "" msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361 -#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:352 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:362 +#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:354 msgid "When upstream tags releases in git" msgstr "" @@ -218,8 +218,8 @@ msgid "Finally, you need an orig tarball:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:435 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423 #, no-wrap msgid "" " % git deborig\n" @@ -300,9 +300,9 @@ msgid "to obtain a release tag, and then proceed as above." msgstr "" #. type: =head3 -#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373 -#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163 -#: ../dgit-maint-debrebase.7.pod:364 +#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:374 +#: ../dgit-maint-merge.7.pod:466 ../dgit-maint-debrebase.7.pod:163 +#: ../dgit-maint-debrebase.7.pod:366 msgid "When upstream releases only tarballs" msgstr "" @@ -314,7 +314,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171 +#: ../dgit-maint-merge.7.pod:156 #, no-wrap msgid "" " % mkdir foo\n" @@ -324,23 +324,23 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177 +#: ../dgit-maint-merge.7.pod:162 msgid "Now create I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181 +#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208 #, 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:171 ../dgit-maint-debrebase.7.pod:186 +#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213 #, no-wrap msgid "" " sign-tags = True\n" @@ -350,21 +350,22 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190 +#: ../dgit-maint-merge.7.pod:175 #, no-wrap msgid "" " [import-orig]\n" " merge-mode = merge\n" +" merge = False\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195 +#: ../dgit-maint-merge.7.pod:181 msgid "gbp-import-orig(1) requires a pre-existing upstream branch:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199 +#: ../dgit-maint-merge.7.pod:185 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -376,20 +377,20 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207 +#: ../dgit-maint-merge.7.pod:193 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211 +#: ../dgit-maint-merge.7.pod:197 #, 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:200 ../dgit-maint-debrebase.7.pod:215 +#: ../dgit-maint-merge.7.pod:201 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 " @@ -397,7 +398,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221 +#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191 #, no-wrap msgid "" " % git remote add -f origin salsa.debian.org:Debian/foo.git\n" @@ -406,31 +407,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:211 +#: ../dgit-maint-merge.7.pod:212 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:214 ../dgit-maint-debrebase.7.pod:233 +#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:235 msgid "CONVERTING AN EXISTING PACKAGE" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235 +#: ../dgit-maint-merge.7.pod:217 ../dgit-maint-debrebase.7.pod:237 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:219 +#: ../dgit-maint-merge.7.pod:220 msgid "No existing git history" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:223 +#: ../dgit-maint-merge.7.pod:224 #, no-wrap msgid "" " % dgit clone foo\n" @@ -440,19 +441,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:229 +#: ../dgit-maint-merge.7.pod:230 msgid "Existing git history using another workflow" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:231 +#: ../dgit-maint-merge.7.pod:232 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:236 +#: ../dgit-maint-merge.7.pod:237 #, no-wrap msgid "" " % git clone git.debian.org:collab-maint/foo\n" @@ -462,12 +463,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:242 +#: ../dgit-maint-merge.7.pod:243 msgid "Now dump any existing patch queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:246 +#: ../dgit-maint-merge.7.pod:247 #, no-wrap msgid "" " % git rm -rf debian/patches\n" @@ -476,12 +477,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:251 +#: ../dgit-maint-merge.7.pod:252 msgid "Then make new upstream tags available:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266 +#: ../dgit-maint-merge.7.pod:256 ../dgit-maint-debrebase.7.pod:268 #, no-wrap msgid "" " % git remote add -f upstream https://some.upstream/foo.git\n" @@ -489,12 +490,12 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:259 +#: ../dgit-maint-merge.7.pod:260 msgid "dgit-test dpkg-source-ignores begin" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:261 +#: ../dgit-maint-merge.7.pod:262 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'(?:^|/)\\." @@ -502,19 +503,19 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:266 +#: ../dgit-maint-merge.7.pod:267 msgid "dgit-test dpkg-source-ignores end" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320 +#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322 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:272 +#: ../dgit-maint-merge.7.pod:273 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-" @@ -525,24 +526,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:279 +#: ../dgit-maint-merge.7.pod:280 msgid "SOURCE PACKAGE CONFIGURATION" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:281 +#: ../dgit-maint-merge.7.pod:282 msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:283 +#: ../dgit-maint-merge.7.pod:284 msgid "" "We set some source package options such that dgit can transparently handle " "the \"dropping\" and \"refreshing\" of changes to the upstream source:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:289 +#: ../dgit-maint-merge.7.pod:290 #, no-wrap msgid "" " single-debian-patch\n" @@ -551,26 +552,26 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:294 +#: ../dgit-maint-merge.7.pod:295 msgid "" "You don't need to create this file if you are using the version 1.0 source " "package format." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:297 +#: ../dgit-maint-merge.7.pod:298 msgid "Sample text for debian/source/patch-header" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:299 +#: ../dgit-maint-merge.7.pod:300 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:304 +#: ../dgit-maint-merge.7.pod:305 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 " @@ -578,7 +579,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:308 +#: ../dgit-maint-merge.7.pod:309 msgid "" "A detailed breakdown of the changes is available from their canonical " "representation - git commits in the packaging repository. For example, to " @@ -587,7 +588,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:316 +#: ../dgit-maint-merge.7.pod:317 #, no-wrap msgid "" " % git clone https://git.dgit.debian.org/foo\n" @@ -597,18 +598,18 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:322 +#: ../dgit-maint-merge.7.pod:323 msgid "" "(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:325 +#: ../dgit-maint-merge.7.pod:326 msgid "A single combined diff, containing all the changes, follows." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:329 +#: ../dgit-maint-merge.7.pod:330 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 " @@ -616,7 +617,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:333 +#: ../dgit-maint-merge.7.pod:334 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 " @@ -624,12 +625,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472 +#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:476 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:340 +#: ../dgit-maint-merge.7.pod:341 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 " @@ -639,7 +640,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:346 +#: ../dgit-maint-merge.7.pod:347 msgid "" "As an 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 " @@ -650,7 +651,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:353 +#: ../dgit-maint-merge.7.pod:354 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), " @@ -658,17 +659,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:357 +#: ../dgit-maint-merge.7.pod:358 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350 +#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356 +#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -676,7 +677,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360 +#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362 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 " @@ -684,7 +685,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366 +#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368 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 " @@ -693,38 +694,43 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371 +#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375 +#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377 #, 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:388 ../dgit-maint-debrebase.7.pod:379 +#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383 +#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" -" % gbp import-orig --no-merge --uscan\n" +" % gbp import-orig --uscan\n" "\n" msgstr "" +#. type: textblock +#: ../dgit-maint-merge.7.pod:397 +msgid "In the following, replace I<1.2.3> with I<upstream/1.2.3>." +msgstr "" + #. type: =head2 -#: ../dgit-maint-merge.7.pod:396 +#: ../dgit-maint-merge.7.pod:399 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:398 +#: ../dgit-maint-merge.7.pod:401 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 " @@ -732,7 +738,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:404 +#: ../dgit-maint-merge.7.pod:407 #, no-wrap msgid "" " % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" @@ -740,12 +746,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:408 +#: ../dgit-maint-merge.7.pod:411 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:412 +#: ../dgit-maint-merge.7.pod:415 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -753,12 +759,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:416 +#: ../dgit-maint-merge.7.pod:419 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:420 +#: ../dgit-maint-merge.7.pod:423 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -768,7 +774,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413 +#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417 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 " @@ -776,17 +782,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503 +#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:440 +#: ../dgit-maint-merge.7.pod:443 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:444 +#: ../dgit-maint-merge.7.pod:447 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -799,7 +805,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:453 +#: ../dgit-maint-merge.7.pod:456 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 " @@ -807,7 +813,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:458 +#: ../dgit-maint-merge.7.pod:461 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 " @@ -816,7 +822,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577 +#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581 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>. " @@ -825,40 +831,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:470 +#: ../dgit-maint-merge.7.pod:473 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:472 +#: ../dgit-maint-merge.7.pod:475 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:478 +#: ../dgit-maint-merge.7.pod:481 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:482 +#: ../dgit-maint-merge.7.pod:485 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:487 +#: ../dgit-maint-merge.7.pod:490 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:492 +#: ../dgit-maint-merge.7.pod:495 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:496 +#: ../dgit-maint-merge.7.pod:499 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -872,7 +878,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:506 +#: ../dgit-maint-merge.7.pod:509 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -880,27 +886,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:582 +#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130 +#: ../dgit-maint-debrebase.7.pod:586 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:518 +#: ../dgit-maint-merge.7.pod:521 msgid "" "Alternatively, you can apply the NMU diff to your repository. The next push " "will then require I<--overwrite>." msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138 -#: ../git-debpush.1.pod:259 +#: ../dgit-maint-merge.7.pod:528 ../dgit-maint-gbp.7.pod:140 +#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144 +#: ../git-debpush.1.pod:266 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784 +#: ../dgit-maint-merge.7.pod:530 ../dgit-maint-debrebase.7.pod:788 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " |