diff options
Diffstat (limited to 'po4a/dgit-maint-merge_7.pot')
| -rw-r--r-- | po4a/dgit-maint-merge_7.pot | 295 |
1 files changed, 167 insertions, 128 deletions
diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot index b973a7a..af37e42 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: 2020-02-02 16:50+0000\n" +"POT-Creation-Date: 2022-12-29 00: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,30 +28,30 @@ msgid "NAME" msgstr "" #. type: =item -#: ../dgit.1:286 ../dgit-maint-merge.7.pod:479 +#: ../dgit.1:296 ../dgit-maint-merge.7.pod:502 #, no-wrap msgid "1." msgstr "" #. type: =item -#: ../dgit.1:287 ../dgit-maint-merge.7.pod:483 +#: ../dgit.1:297 ../dgit-maint-merge.7.pod:506 #, no-wrap msgid "2." msgstr "" #. type: =item -#: ../dgit.1:288 ../dgit-maint-merge.7.pod:488 +#: ../dgit.1:298 ../dgit-maint-merge.7.pod:511 #, no-wrap msgid "3." msgstr "" #. type: =head1 -#: ../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: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 +#: ../dgit.1:1676 ../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:547 ../dgit-maint-gbp.7.pod:139 +#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:322 ../dgit-maint-bpo.7.pod:140 +#: ../git-debrebase.1.pod:637 ../git-debrebase.5.pod:678 #: ../git-debpush.1.pod:261 #, no-wrap msgid "SEE ALSO" @@ -66,13 +66,13 @@ msgid "INTRODUCTION" msgstr "" #. type: textblock -#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128 -#: ../dgit-maint-merge.7.pod:526 ../dgit-maint-gbp.7.pod:138 +#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:127 +#: ../dgit-maint-merge.7.pod:549 ../dgit-maint-gbp.7.pod:141 msgid "dgit(1), dgit(7)" msgstr "" #. type: verbatim -#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:517 +#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:540 #, 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:362 -#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67 -#: ../dgit-maint-debrebase.7.pod:354 +#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:385 +#: ../dgit-maint-merge.7.pod:464 ../dgit-maint-debrebase.7.pod:67 +#: ../dgit-maint-debrebase.7.pod:362 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:435 -#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423 +#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:458 +#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:429 #, no-wrap msgid "" " % git deborig\n" @@ -299,22 +299,37 @@ msgstr "" 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: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 +#: ../dgit-maint-merge.7.pod:157 ../dgit-maint-merge.7.pod:397 +#: ../dgit-maint-merge.7.pod:489 ../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:151 +#: ../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:156 +#: ../dgit-maint-merge.7.pod:164 #, no-wrap msgid "" " % mkdir foo\n" @@ -324,12 +339,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:162 +#: ../dgit-maint-merge.7.pod:170 msgid "Now create I<debian/gbp.conf>:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208 +#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:216 #, no-wrap msgid "" " [DEFAULT]\n" @@ -340,7 +355,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213 +#: ../dgit-maint-merge.7.pod:179 ../dgit-maint-debrebase.7.pod:221 #, no-wrap msgid "" " sign-tags = True\n" @@ -350,7 +365,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:175 +#: ../dgit-maint-merge.7.pod:183 #, no-wrap msgid "" " [import-orig]\n" @@ -360,12 +375,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:181 +#: ../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:185 +#: ../dgit-maint-merge.7.pod:193 #, no-wrap msgid "" " % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n" @@ -377,12 +392,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:193 +#: ../dgit-maint-merge.7.pod:201 msgid "Then we can import the upstream version:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:197 +#: ../dgit-maint-merge.7.pod:205 #, no-wrap msgid "" " % gbp import-orig --merge --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n" @@ -390,7 +405,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:201 +#: ../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 " @@ -398,7 +413,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191 +#: ../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" @@ -407,31 +422,31 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:212 +#: ../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:215 ../dgit-maint-debrebase.7.pod:235 +#: ../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:217 ../dgit-maint-debrebase.7.pod:237 +#: ../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:220 +#: ../dgit-maint-merge.7.pod:228 msgid "No existing git history" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:224 +#: ../dgit-maint-merge.7.pod:232 #, no-wrap msgid "" " % dgit clone foo\n" @@ -441,19 +456,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:230 +#: ../dgit-maint-merge.7.pod:238 msgid "Existing git history using another workflow" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:232 +#: ../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:237 +#: ../dgit-maint-merge.7.pod:245 #, no-wrap msgid "" " % git clone git.debian.org:collab-maint/foo\n" @@ -463,12 +478,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:243 +#: ../dgit-maint-merge.7.pod:251 msgid "Now dump any existing patch queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:247 +#: ../dgit-maint-merge.7.pod:255 #, no-wrap msgid "" " % git rm -rf debian/patches\n" @@ -477,12 +492,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:252 +#: ../dgit-maint-merge.7.pod:260 msgid "Then make new upstream tags available:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:256 ../dgit-maint-debrebase.7.pod:268 +#: ../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" @@ -490,12 +505,12 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:260 +#: ../dgit-maint-merge.7.pod:268 msgid "dgit-test dpkg-source-ignores begin" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:262 +#: ../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'(?:^|/)\\." @@ -503,19 +518,19 @@ msgid "" msgstr "" #. type: =for -#: ../dgit-maint-merge.7.pod:267 +#: ../dgit-maint-merge.7.pod:275 msgid "dgit-test dpkg-source-ignores end" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322 +#: ../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:273 +#: ../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-" @@ -526,52 +541,85 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:280 -msgid "SOURCE PACKAGE CONFIGURATION" +#: ../dgit-maint-merge.7.pod:288 +msgid "SOURCE PACKAGE AND GIT WORKING TREE CONFIGURATION" +msgstr "" + +#. type: =head2 +#: ../dgit-maint-merge.7.pod:290 +msgid "dgit configuration" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:292 +msgid "" +"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:297 +#, no-wrap +msgid "" +" git config dgit.default.quilt-mode single\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:301 +msgid "" +"This affects only this one git tree; your other git trees for this package " +"(and co-maintainers) will need it too. Don't set it more globally, because " +"the maintainers of any other packages you work on, or send patches for, may " +"be offended by its effects." +msgstr "" + +#. type: textblock +#: ../dgit-maint-merge.7.pod:309 +msgid "unpleasant NMUs" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:282 +#: ../dgit-maint-merge.7.pod:311 msgid "debian/source/options" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:284 +#: ../dgit-maint-merge.7.pod:313 msgid "" -"We set some source package options such that dgit can transparently handle " -"the \"dropping\" and \"refreshing\" of changes to the upstream source:" +"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:319 #, no-wrap msgid "" -" single-debian-patch\n" " auto-commit\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:295 +#: ../dgit-maint-merge.7.pod:323 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:298 -msgid "Sample text for debian/source/patch-header" +#: ../dgit-maint-merge.7.pod:326 +msgid "Sample text for debian/README.source" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:300 +#: ../dgit-maint-merge.7.pod:328 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:305 +#: ../dgit-maint-merge.7.pod:333 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 " @@ -579,7 +627,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:309 +#: ../dgit-maint-merge.7.pod:337 msgid "" "A detailed breakdown of the changes is available from their canonical " "representation - git commits in the packaging repository. For example, to " @@ -588,7 +636,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:317 +#: ../dgit-maint-merge.7.pod:345 #, no-wrap msgid "" " % git clone https://git.dgit.debian.org/foo\n" @@ -598,60 +646,51 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:323 +#: ../dgit-maint-merge.7.pod:351 msgid "" "(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:326 +#: ../dgit-maint-merge.7.pod:354 msgid "A single combined diff, containing all the changes, follows." msgstr "" -#. type: textblock -#: ../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 " -"ignores debian/source/patch-header." -msgstr "" - -#. type: textblock -#: ../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 " -"might distract from more important information present in README.source." -msgstr "" - #. type: =head1 -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:476 +#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:482 msgid "BUILDING AND UPLOADING" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:341 +#: ../dgit-maint-merge.7.pod:360 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:347 +#: ../dgit-maint-merge.7.pod:366 msgid "" -"As an alternative to B<dgit build> and friends, you can use a tool like " +"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:370 +msgid "" +"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:354 +#: ../dgit-maint-merge.7.pod:377 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), " @@ -659,17 +698,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:358 +#: ../dgit-maint-merge.7.pod:381 msgid "NEW UPSTREAM RELEASES" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352 +#: ../dgit-maint-merge.7.pod:383 ../dgit-maint-debrebase.7.pod:360 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358 +#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:366 #, no-wrap msgid "" " % git fetch --tags upstream\n" @@ -677,7 +716,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362 +#: ../dgit-maint-merge.7.pod:393 ../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 " @@ -685,7 +724,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368 +#: ../dgit-maint-merge.7.pod:399 ../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 " @@ -694,12 +733,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373 +#: ../dgit-maint-merge.7.pod:404 ../dgit-maint-debrebase.7.pod:381 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:385 #, no-wrap msgid "" " % gbp import-orig ../foo_1.2.3.orig.tar.xz\n" @@ -707,12 +746,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381 +#: ../dgit-maint-merge.7.pod:412 ../dgit-maint-debrebase.7.pod:389 msgid "or if you have a working watch file" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385 +#: ../dgit-maint-merge.7.pod:416 ../dgit-maint-debrebase.7.pod:393 #, no-wrap msgid "" " % gbp import-orig --uscan\n" @@ -720,17 +759,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:397 +#: ../dgit-maint-merge.7.pod:420 msgid "In the following, replace I<1.2.3> with I<upstream/1.2.3>." msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:399 +#: ../dgit-maint-merge.7.pod:422 msgid "Reviewing & merging the release" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:401 +#: ../dgit-maint-merge.7.pod:424 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 " @@ -738,7 +777,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:407 +#: ../dgit-maint-merge.7.pod:430 #, no-wrap msgid "" " % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n" @@ -746,12 +785,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:411 +#: ../dgit-maint-merge.7.pod:434 msgid "You can then review the full merge diff:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:415 +#: ../dgit-maint-merge.7.pod:438 #, no-wrap msgid "" " % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n" @@ -759,12 +798,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:419 +#: ../dgit-maint-merge.7.pod:442 msgid "Once you're satisfied with what will be merged, update your package:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:423 +#: ../dgit-maint-merge.7.pod:446 #, no-wrap msgid "" " % git merge 1.2.3\n" @@ -774,7 +813,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417 +#: ../dgit-maint-merge.7.pod:452 ../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 " @@ -782,17 +821,17 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507 +#: ../dgit-maint-merge.7.pod:462 ../dgit-maint-debrebase.7.pod:517 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:443 +#: ../dgit-maint-merge.7.pod:466 msgid "We create a DFSG-clean tag to merge to master:" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:447 +#: ../dgit-maint-merge.7.pod:470 #, no-wrap msgid "" " % git checkout -b pre-dfsg 1.2.3\n" @@ -805,7 +844,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:456 +#: ../dgit-maint-merge.7.pod:479 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 " @@ -813,7 +852,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:461 +#: ../dgit-maint-merge.7.pod:484 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 " @@ -822,7 +861,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581 +#: ../dgit-maint-merge.7.pod:491 ../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>. " @@ -831,40 +870,40 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:473 +#: ../dgit-maint-merge.7.pod:496 msgid "FORWARDING PATCHES UPSTREAM" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:475 +#: ../dgit-maint-merge.7.pod:498 msgid "The basic steps are:" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:481 +#: ../dgit-maint-merge.7.pod:504 msgid "Create a new branch based off upstream's master branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:485 +#: ../dgit-maint-merge.7.pod:508 msgid "" "git-cherry-pick(1) commits from your master branch onto your new branch." msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:490 +#: ../dgit-maint-merge.7.pod:513 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:495 +#: ../dgit-maint-merge.7.pod:518 msgid "For example (and it is only an example):" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:499 +#: ../dgit-maint-merge.7.pod:522 #, no-wrap msgid "" " % # fork foo.git on GitHub\n" @@ -878,7 +917,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:509 +#: ../dgit-maint-merge.7.pod:532 msgid "" "Note that when you merge an upstream release containing your forwarded " "patches, git and dgit will transparently handle \"dropping\" the patches " @@ -886,27 +925,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:586 +#: ../dgit-maint-merge.7.pod:536 ../dgit-maint-gbp.7.pod:133 +#: ../dgit-maint-debrebase.7.pod:596 msgid "INCORPORATING NMUS" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:521 +#: ../dgit-maint-merge.7.pod:544 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:528 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144 +#: ../dgit-maint-merge.7.pod:551 ../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:530 ../dgit-maint-debrebase.7.pod:788 +#: ../dgit-maint-merge.7.pod:553 ../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 " |