diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-01-06 17:50:48 +0000 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2019-01-06 19:14:48 +0000 |
| commit | aa57a5799afda71dd5750b05bfaccd9ec74e5c08 (patch) | |
| tree | 4bf4c8a41e9212b83b4fadd44175d718561336bd /po4a | |
| parent | f4a1dfadf1ccc71aaab1a63fb4418c1ceba0710d (diff) | |
i18n-commit - autogenerated
Diffstat (limited to 'po4a')
| -rw-r--r-- | po4a/dgit-maint-debrebase_7.pot | 293 | ||||
| -rw-r--r-- | po4a/dgit_1.pot | 537 | ||||
| -rw-r--r-- | po4a/git-debrebase_1.pot | 219 |
3 files changed, 585 insertions, 464 deletions
diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot index 5161500..b937feb 100644 --- a/po4a/dgit-maint-debrebase_7.pot +++ b/po4a/dgit-maint-debrebase_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: 2019-01-06 17: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" @@ -27,11 +27,11 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1469 ../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 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -68,7 +68,7 @@ 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-debrebase.7.pod:326 msgid "When upstream tags releases in git" msgstr "" @@ -107,7 +107,7 @@ 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-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:388 #, no-wrap msgid "" " % git deborig\n" @@ -129,7 +129,7 @@ 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-debrebase.7.pod:334 msgid "When upstream releases only tarballs" msgstr "" @@ -246,24 +246,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:289 +#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:294 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: =head1 -#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:436 +#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:441 msgid "BUILDING AND UPLOADING" msgstr "" #. type: =head2 -#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319 +#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:324 msgid "Obtaining the release" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325 +#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:330 #, no-wrap msgid "" " % git remote update\n" @@ -271,7 +271,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331 +#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:336 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 " @@ -280,12 +280,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336 +#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:341 msgid "Then, either" msgstr "" #. type: verbatim -#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340 +#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:345 #, no-wrap msgid "" " % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n" @@ -293,12 +293,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344 +#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:349 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:362 ../dgit-maint-debrebase.7.pod:353 #, no-wrap msgid "" " % gbp import-orig --no-merge --uscan\n" @@ -306,7 +306,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377 +#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:382 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 " @@ -314,12 +314,12 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461 +#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:472 msgid "HANDLING DFSG-NON-FREE MATERIAL" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521 +#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:546 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>. " @@ -329,18 +329,18 @@ msgstr "" #. type: =head1 #: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130 -#: ../dgit-maint-debrebase.7.pod:526 +#: ../dgit-maint-debrebase.7.pod:551 msgid "INCORPORATING NMUS" msgstr "" #. type: =head1 #: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140 -#: ../dgit-maint-debrebase.7.pod:726 +#: ../dgit-maint-debrebase.7.pod:751 msgid "AUTHOR" msgstr "" #. type: textblock -#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728 +#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:753 msgid "" "This tutorial was written and is maintained by Sean Whitton " "<spwhitton@spwhitton.name>. It contains contributions from other dgit " @@ -348,7 +348,7 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:293 +#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:298 msgid "GIT CONFIGURATION" msgstr "" @@ -577,18 +577,27 @@ msgid "" "Use" msgstr "" -#. type: =item +#. type: textblock #: ../dgit-maint-debrebase.7.pod:272 +msgid "" +"If you were not previously using dgit to upload your package (i.e. you were " +"not using the workflow described in dgit-maint-gbp(7)), and you happen to " +"have run B<dgit fetch sid> in this clone of the repository, you will need to " +"pass I<--fdiverged> to this command." +msgstr "" + +#. type: =item +#: ../dgit-maint-debrebase.7.pod:277 msgid "(C) There is a delta queue, and patches are applied." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:274 +#: ../dgit-maint-debrebase.7.pod:279 msgid "Use" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:278 +#: ../dgit-maint-debrebase.7.pod:283 #, no-wrap msgid "" " % git debrebase convert-from-dgit-view\n" @@ -596,7 +605,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:284 +#: ../dgit-maint-debrebase.7.pod:289 msgid "" "Finally, you need to ensure that your git HEAD is dgit-compatible, i.e., it " "is exactly what you would get if you deleted .git, invoked B<dpkg-" @@ -604,7 +613,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:295 +#: ../dgit-maint-debrebase.7.pod:300 msgid "" "git-debrebase(1) does not yet support using B<git merge> to merge divergent " "branches of development (see \"OTHER MERGES\" in git-debrebase(5)). You " @@ -612,7 +621,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:302 +#: ../dgit-maint-debrebase.7.pod:307 #, no-wrap msgid "" " % git config --local pull.rebase true\n" @@ -620,14 +629,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:306 +#: ../dgit-maint-debrebase.7.pod:311 msgid "" "Now when you pull work from other Debian contributors, git will rebase your " "work on top of theirs." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:309 +#: ../dgit-maint-debrebase.7.pod:314 msgid "" "If you use this clone for upstream development in addition to Debian " "packaging work, you may not want to set this global setting. Instead, see " @@ -636,24 +645,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:314 +#: ../dgit-maint-debrebase.7.pod:319 msgid "IMPORTING NEW UPSTREAM RELEASES" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:316 +#: ../dgit-maint-debrebase.7.pod:321 msgid "" "There are two steps: obtaining git refs that correspond to the new release, " "and importing that release using git-debrebase(1)." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:352 +#: ../dgit-maint-debrebase.7.pod:357 msgid "Importing the release" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:356 +#: ../dgit-maint-debrebase.7.pod:361 #, no-wrap msgid "" " % git debrebase new-upstream 1.2.3\n" @@ -661,7 +670,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:360 +#: ../dgit-maint-debrebase.7.pod:365 msgid "" "This invocation of git-debrebase(1) involves a git rebase. You may need to " "resolve conflicts if the Debian delta queue does not apply cleanly to the " @@ -669,13 +678,13 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:364 +#: ../dgit-maint-debrebase.7.pod:369 msgid "" "If all went well, you can now review the merge of the new upstream release:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:369 +#: ../dgit-maint-debrebase.7.pod:374 #, no-wrap msgid "" " git diff debian/1.2.2-1..HEAD -- . ':!debian'\n" @@ -683,7 +692,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:373 +#: ../dgit-maint-debrebase.7.pod:378 msgid "" "Pass I<--stat> just to see the list of changed files, which is useful to " "determine whether there are any new or deleted files to may need accounting " @@ -691,27 +700,27 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:387 +#: ../dgit-maint-debrebase.7.pod:392 msgid "EDITING THE DEBIAN PACKAGING" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:389 +#: ../dgit-maint-debrebase.7.pod:394 msgid "Just make commits on master that change the contents of I<debian/>." msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:391 +#: ../dgit-maint-debrebase.7.pod:396 msgid "EDITING THE DELTA QUEUE" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:393 +#: ../dgit-maint-debrebase.7.pod:398 msgid "Adding new patches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:395 +#: ../dgit-maint-debrebase.7.pod:400 msgid "" "Adding new patches is straightforward: just make commits touching only files " "outside of the I<debian/> directory. You can also use tools like git-" @@ -719,19 +728,19 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:399 +#: ../dgit-maint-debrebase.7.pod:404 msgid "Editing patches: starting a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:401 +#: ../dgit-maint-debrebase.7.pod:406 msgid "" "git-debrebase(1) is a wrapper around git-rebase(1) which allows us to edit, " "re-order and delete patches. Run" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:406 ../dgit-maint-debrebase.7.pod:689 +#: ../dgit-maint-debrebase.7.pod:411 ../dgit-maint-debrebase.7.pod:714 #, no-wrap msgid "" " % git debrebase -i\n" @@ -739,19 +748,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:410 +#: ../dgit-maint-debrebase.7.pod:415 msgid "" "to start an interactive rebase. You can edit, re-order and delete commits " "just as you would during B<git rebase -i>." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:413 +#: ../dgit-maint-debrebase.7.pod:418 msgid "Editing patches: finishing a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:415 +#: ../dgit-maint-debrebase.7.pod:420 msgid "" "After completing the git rebase, your branch will not be a fast-forward of " "the git HEAD you had before the rebase. This means that we cannot push the " @@ -760,14 +769,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:421 +#: ../dgit-maint-debrebase.7.pod:426 msgid "" "If you are not yet ready to upload, and want to push your branch to a git " "remote such as B<salsa.debian.org>," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:426 +#: ../dgit-maint-debrebase.7.pod:431 #, no-wrap msgid "" " % git debrebase conclude\n" @@ -775,7 +784,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:430 +#: ../dgit-maint-debrebase.7.pod:435 msgid "" "Note that each time you conclude a debrebase you introduce a pseudomerge " "into your git history, which may make it harder to read. Try to do all of " @@ -785,7 +794,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:438 +#: ../dgit-maint-debrebase.7.pod:443 msgid "" "You can use dpkg-buildpackage(1) for test builds. When you are ready to " "build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit " @@ -793,14 +802,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:442 +#: ../dgit-maint-debrebase.7.pod:447 msgid "" "Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> " "if the package is new in the target suite." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:445 +#: ../dgit-maint-debrebase.7.pod:450 +msgid "" +"In some cases where you used B<git debrebase convert-from-gbp> since the " +"last upload, it is not possible for dgit to make your history fast-" +"forwarding from the history on B<dgit-repos>. In such cases you will have " +"to pass I<--overwrite> to dgit. git-debrebase will normally tell you if " +"this is will be needed." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:456 msgid "" "Right before uploading, if you did not just already do so, you might want to " "have git-debrebase(1) shuffle your branch such that the Debian delta queue " @@ -808,7 +827,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:451 +#: ../dgit-maint-debrebase.7.pod:462 #, no-wrap msgid "" " % git debrebase\n" @@ -817,24 +836,24 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:456 +#: ../dgit-maint-debrebase.7.pod:467 msgid "Note that this will introduce a new pseudomerge." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:458 +#: ../dgit-maint-debrebase.7.pod:469 msgid "" "After dgit pushing, be sure to git push to B<salsa.debian.org>, if you're " "using that." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:463 +#: ../dgit-maint-debrebase.7.pod:474 msgid "Illegal material" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:465 +#: ../dgit-maint-debrebase.7.pod:476 msgid "" "Here we explain how to handle material that is merely DFSG-non-free. " "Material which is legally dangerous (for example, files which are actually " @@ -842,7 +861,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:469 +#: ../dgit-maint-debrebase.7.pod:480 #, no-wrap msgid "" "If you encounter possibly-legally-dangerous material in the upstream\n" @@ -854,25 +873,26 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:475 +#: ../dgit-maint-debrebase.7.pod:486 msgid "DFSG-non-free: When upstream tags releases in git" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:477 +#: ../dgit-maint-debrebase.7.pod:488 msgid "" "Our approach is to maintain a DFSG-clean upstream branch, and create tags on " "this branch for each release that we want to import. We then import those " -"tags per \"Importing the release\", above." +"tags per \"Importing the release\", above. In the case of a new package, we " +"base our initial Debianisation on our first DFSG-clean tag." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:481 +#: ../dgit-maint-debrebase.7.pod:494 msgid "For the first upstream release that requires DFSG filtering:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:485 +#: ../dgit-maint-debrebase.7.pod:498 #, no-wrap msgid "" " % git checkout -b upstream-dfsg 1.2.3\n" @@ -880,17 +900,38 @@ msgid "" " % git commit -m \"upstream version 1.2.3 DFSG-cleaned\"\n" " % git tag -s 1.2.3+dfsg\n" " % git checkout master\n" -" % # proceed with \"Importing the release\" on 1.2.3+dfsg tag\n" "\n" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:494 -msgid "And for subsequent releases (whether or not they require filtering):" +#: ../dgit-maint-debrebase.7.pod:506 +msgid "" +"Now either proceed with \"Importing the release\" on the 1.2.3+dfsg tag, or " +"in the case of a new package," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:498 +#: ../dgit-maint-debrebase.7.pod:511 +#, no-wrap +msgid "" +" % git branch --unset-upstream\n" +" % git reset --hard 1.2.3+dfsg\n" +"\n" +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:516 +msgid "and proceed with \"INITIAL DEBIANISATION\"." +msgstr "" + +#. type: textblock +#: ../dgit-maint-debrebase.7.pod:518 +msgid "" +"For subsequent releases (whether or not they require additional filtering):" +msgstr "" + +#. type: verbatim +#: ../dgit-maint-debrebase.7.pod:523 #, no-wrap msgid "" " % git checkout upstream-dfsg\n" @@ -904,7 +945,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:508 +#: ../dgit-maint-debrebase.7.pod:533 msgid "" "Our upstream-dfsg 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 " @@ -913,7 +954,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:515 +#: ../dgit-maint-debrebase.7.pod:540 #, no-wrap msgid "" " % git push --follow-tags -u origin master upstream-dfsg\n" @@ -921,17 +962,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:519 +#: ../dgit-maint-debrebase.7.pod:544 msgid "DFSG-non-free: When upstream releases only tarballs" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:528 +#: ../dgit-maint-debrebase.7.pod:553 msgid "In the simplest case," msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:532 +#: ../dgit-maint-debrebase.7.pod:557 #, no-wrap msgid "" " % dgit fetch\n" @@ -940,7 +981,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:537 +#: ../dgit-maint-debrebase.7.pod:562 msgid "" "If that fails, because your branch and the NMUers work represent divergent " "branches of development, you have a number of options. Here we describe the " @@ -948,7 +989,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:541 +#: ../dgit-maint-debrebase.7.pod:566 msgid "" "Note that you should not try to resolve the divergent branches by editing " "files in I<debian/patches>. Changes there would either cause trouble, or be " @@ -956,12 +997,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:545 +#: ../dgit-maint-debrebase.7.pod:570 msgid "Rebasing your work onto the NMU" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:549 +#: ../dgit-maint-debrebase.7.pod:574 #, no-wrap msgid "" " % git rebase dgit/dgit/sid\n" @@ -969,14 +1010,14 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:553 +#: ../dgit-maint-debrebase.7.pod:578 msgid "" "If the NMUer added new commits modifying the upstream source, you will " "probably want to debrebase before your next upload to tidy those up." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:556 +#: ../dgit-maint-debrebase.7.pod:581 msgid "" "For example, the NMUer might have used git-revert(1) to unapply one of your " "patches. A debrebase can be used to strip both the patch and the reversion " @@ -984,12 +1025,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:560 +#: ../dgit-maint-debrebase.7.pod:585 msgid "Manually applying the debdiff" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:562 +#: ../dgit-maint-debrebase.7.pod:587 msgid "" "If you cannot rebase because you have already pushed to B<salsa.debian.org>, " "say, you can manually apply the NMU debdiff, commit and debrebase. The next " @@ -997,24 +1038,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit-maint-debrebase.7.pod:567 +#: ../dgit-maint-debrebase.7.pod:592 msgid "HINTS AND TIPS" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:569 +#: ../dgit-maint-debrebase.7.pod:594 msgid "Minimising pseudomerges" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:571 +#: ../dgit-maint-debrebase.7.pod:596 msgid "" "Above we noted that each time you conclude a debrebase, you introduce a " "pseudomerge into your git history, which may make it harder to read." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:574 +#: ../dgit-maint-debrebase.7.pod:599 msgid "" "A simple convention you can use to minimise the number of pseudomerges is to " "B<git debrebase conclude> only right before you upload or push to B<salsa." @@ -1022,7 +1063,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:578 +#: ../dgit-maint-debrebase.7.pod:603 msgid "" "It is possible, though much less convenient, to reduce the number of " "pseudomerges yet further. We debrebase only (i) when importing a new " @@ -1034,12 +1075,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:586 +#: ../dgit-maint-debrebase.7.pod:611 msgid "The debian/patches directory" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:588 +#: ../dgit-maint-debrebase.7.pod:613 msgid "" "In this workflow, I<debian/patches> is purely an output of git-" "debrebase(1). You should not make changes there. They will either cause " @@ -1047,7 +1088,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:593 +#: ../dgit-maint-debrebase.7.pod:618 msgid "" "I<debian/patches> will often be out-of-date because git-debrebase(1) will " "only regenerate it when it needs to. So you should not rely on the " @@ -1057,17 +1098,17 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:599 +#: ../dgit-maint-debrebase.7.pod:624 msgid "Upstream branches" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:601 +#: ../dgit-maint-debrebase.7.pod:626 msgid "In this workflow, we specify upstream tags rather than any branches." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:603 +#: ../dgit-maint-debrebase.7.pod:628 msgid "" "Except when (i) upstream releases only tarballs, (ii) we require DFSG " "filtering, or (iii) you also happen to be involved in upstream development, " @@ -1076,7 +1117,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:609 +#: ../dgit-maint-debrebase.7.pod:634 msgid "" "The idea here is that from Debian's point of view, upstream releases are " "immutable points in history. We want to make sure that we are basing our " @@ -1085,19 +1126,19 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:615 +#: ../dgit-maint-debrebase.7.pod:640 msgid "" "Upstream's branches remain available as the git remote tracking branches for " "your upstream remote, e.g. I<remotes/upstream/master>." msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:618 +#: ../dgit-maint-debrebase.7.pod:643 msgid "The first ever dgit push" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:620 +#: ../dgit-maint-debrebase.7.pod:645 msgid "" "If this is the first ever dgit push of the package, consider passing I<--" "deliberately-not-fast-forward> instead of I<--overwrite>. This avoids " @@ -1107,12 +1148,12 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:626 +#: ../dgit-maint-debrebase.7.pod:651 msgid "Inspecting the history" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:628 +#: ../dgit-maint-debrebase.7.pod:653 msgid "" "The git history made by git-debrebase can seem complicated. Here are some " "suggestions for helpful invocations of gitk and git. They can be adapted " @@ -1120,12 +1161,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:632 +#: ../dgit-maint-debrebase.7.pod:657 msgid "History of package in Debian, disregarding history from upstream:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:636 +#: ../dgit-maint-debrebase.7.pod:661 #, no-wrap msgid "" " % gitk --first-parent\n" @@ -1133,17 +1174,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:638 +#: ../dgit-maint-debrebase.7.pod:663 msgid "In a laundered branch, the delta queue is at the top." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:642 +#: ../dgit-maint-debrebase.7.pod:667 msgid "History of the packaging, excluding the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:644 +#: ../dgit-maint-debrebase.7.pod:669 #, no-wrap msgid "" " % gitk :/debian :!/debian/patches\n" @@ -1151,12 +1192,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:646 +#: ../dgit-maint-debrebase.7.pod:671 msgid "Just the delta queue (i.e. Debian's changes to upstream):" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:648 +#: ../dgit-maint-debrebase.7.pod:673 #, no-wrap msgid "" " % gitk --first-parent -- :/ :!/debian\n" @@ -1164,12 +1205,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:650 +#: ../dgit-maint-debrebase.7.pod:675 msgid "Full history including old versions of the delta queue:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:654 +#: ../dgit-maint-debrebase.7.pod:679 #, no-wrap msgid "" " % gitk --date-order\n" @@ -1177,7 +1218,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:656 +#: ../dgit-maint-debrebase.7.pod:681 msgid "" "The \"Declare fast forward\" commits you see have an older history (usually, " "an older delta queue) as one parent, and a newer history as the other. --" @@ -1185,12 +1226,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:663 +#: ../dgit-maint-debrebase.7.pod:688 msgid "Complete diff since the last upload:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:667 +#: ../dgit-maint-debrebase.7.pod:692 #, no-wrap msgid "" " % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n" @@ -1198,17 +1239,17 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:669 +#: ../dgit-maint-debrebase.7.pod:694 msgid "This includes changes to upstream files." msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:673 +#: ../dgit-maint-debrebase.7.pod:698 msgid "Interdiff of delta queue since last upload, if you really want it:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:675 +#: ../dgit-maint-debrebase.7.pod:700 #, no-wrap msgid "" " % git debrebase make-patches\n" @@ -1217,12 +1258,12 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:678 +#: ../dgit-maint-debrebase.7.pod:703 msgid "And of course there is:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:680 +#: ../dgit-maint-debrebase.7.pod:705 #, no-wrap msgid "" " % git debrebase status\n" @@ -1230,24 +1271,24 @@ msgid "" msgstr "" #. type: =head2 -#: ../dgit-maint-debrebase.7.pod:682 +#: ../dgit-maint-debrebase.7.pod:707 msgid "Alternative ways to start a debrebase" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:684 +#: ../dgit-maint-debrebase.7.pod:709 msgid "" "Above we started an interactive debrebase by invoking git-debrebase(1) like " "this:" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:693 +#: ../dgit-maint-debrebase.7.pod:718 msgid "It is also possible to perform a non-interactive rebase, like this:" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:697 +#: ../dgit-maint-debrebase.7.pod:722 #, no-wrap msgid "" " % git debrebase -- [git-rebase options...]\n" @@ -1255,7 +1296,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:702 +#: ../dgit-maint-debrebase.7.pod:727 msgid "" "A third alternative is to have git-debrebase(1) shuffle all the Debian " "changes to the end of your branch, and then manipulate them yourself using " @@ -1263,7 +1304,7 @@ msgid "" msgstr "" #. type: verbatim -#: ../dgit-maint-debrebase.7.pod:708 +#: ../dgit-maint-debrebase.7.pod:733 #, no-wrap msgid "" " % git debrebase\n" @@ -1272,7 +1313,7 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:713 +#: ../dgit-maint-debrebase.7.pod:738 msgid "" "If you take this approach, you should be very careful not to start the " "rebase too early, including before the most recent pseudomerge. git-rebase " @@ -1282,6 +1323,6 @@ msgid "" msgstr "" #. type: textblock -#: ../dgit-maint-debrebase.7.pod:724 +#: ../dgit-maint-debrebase.7.pod:749 msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)" msgstr "" diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot index ff4a730..97cbcd7 100644 --- a/po4a/dgit_1.pot +++ b/po4a/dgit_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-13 20:41+0100\n" +"POT-Creation-Date: 2019-01-06 17: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" @@ -417,7 +417,7 @@ msgid "B<dgit help>" msgstr "" #. type: Plain text -#: ../dgit.1:185 ../dgit.1:1168 +#: ../dgit.1:185 ../dgit.1:1192 msgid "Print a usage summary." msgstr "" @@ -955,7 +955,7 @@ msgid "This function is primarily provided for the benefit of git-debrebase." msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:441 +#: ../dgit.1:496 ../git-debrebase.1.pod:462 #, no-wrap msgid "OPTIONS" msgstr "" @@ -1055,31 +1055,56 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:555 +#: ../dgit.1:548 msgid "" "dgit will only actually clean the tree if it needs to (because it needs to " -"build the source package or binaries from your working tree). Otherwise any " -"untracked files will be simply ignored. p.TP B<--clean=git-ff> | B<-wgf> " +"build the source package or binaries from your working tree). Otherwise it " +"will just check that there are no untracked unignored files. See --" +"clean=git[-ff],always, below." +msgstr "" + +#. type: TP +#: ../dgit.1:548 +#, no-wrap +msgid "B<--clean=git-ff> | B<-wgf>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:557 +msgid "" "Use B<git clean -xdff> to clean the working tree. Like git clean -xdf but " "it also removes any subdirectories containing different git trees (which " "only unusual packages are likely to create)." msgstr "" #. type: TP -#: ../dgit.1:555 +#: ../dgit.1:557 #, no-wrap -msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" +msgid "B<--clean=git>[B<-ff>]B<,always> | B<-wga> | B<-wgfa>" msgstr "" #. type: Plain text #: ../dgit.1:561 msgid "" +"Like --clean=git, but always does the clean and not just a check, deleting " +"any untracked un-ignored files." +msgstr "" + +#. type: TP +#: ../dgit.1:561 +#, no-wrap +msgid "B<--clean=check> | B<--clean=check,ignores> | B<-wc> | B<-wci>" +msgstr "" + +#. type: Plain text +#: ../dgit.1:567 +msgid "" "Merely check that the tree is clean (does not contain uncommitted files). " "Avoids running rules clean, and can avoid needing the build-dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:572 +#: ../dgit.1:578 msgid "" "With B<,ignores> or B<-wci>, untracked files covered by .gitignore are " "tolerated, so only files which show up as B<?> in git status (ie, ones you " @@ -1087,13 +1112,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:572 +#: ../dgit.1:578 #, no-wrap msgid "B<--clean=none> | B<-wn>" msgstr "" #. type: Plain text -#: ../dgit.1:580 +#: ../dgit.1:586 msgid "" "Do not clean the tree, nor check that it is clean. Avoids running rules " "clean, and can avoid needing the build-dependencies. If there are files " @@ -1102,13 +1127,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:580 +#: ../dgit.1:586 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>] | B<-wd> | B<-wdd>" msgstr "" #. type: Plain text -#: ../dgit.1:585 +#: ../dgit.1:591 msgid "" "Use dpkg-buildpackage to do the clean, so that the source package is cleaned " "by dpkg-source running the package's clean target. --clean=dpkg-source is " @@ -1116,12 +1141,12 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:589 +#: ../dgit.1:595 msgid "Without the extra B<d>, requires the package's build dependencies." msgstr "" #. type: Plain text -#: ../dgit.1:599 +#: ../dgit.1:605 msgid "" "With B<...>-d or B<-wdd>, the build-dependencies are not checked (due to " "passing B<-d> to dpkg-buildpackage), which violates policy, but may work in " @@ -1129,7 +1154,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:606 +#: ../dgit.1:612 msgid "" "The rules clean target will only be run if it is needed: when dgit is going " "to build source or binary packages from your working tree, rather than from " @@ -1138,7 +1163,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:616 +#: ../dgit.1:622 msgid "" "In all cases, dgit will check that there are (after rules clean, if " "applicable) no untracked un-ignored files, in case these are files you " @@ -1149,38 +1174,38 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:616 +#: ../dgit.1:622 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,no-check> | B<-wdn> | B<-wddn>" msgstr "" #. type: Plain text -#: ../dgit.1:620 +#: ../dgit.1:626 msgid "" "Like --clean=dpkg-source, but does not care about untracked un-ignored files." msgstr "" #. type: TP -#: ../dgit.1:620 +#: ../dgit.1:626 #, no-wrap msgid "B<--clean=dpkg-source>[B<-d>]B<,all-check> | B<-wda> | B<-wdda>" msgstr "" #. type: Plain text -#: ../dgit.1:625 +#: ../dgit.1:631 msgid "" "Like --clean=dpkg-source, but fails even on ignored untracked files. This " "could perhaps be used to detect bugs in your rules clean target." msgstr "" #. type: TP -#: ../dgit.1:625 +#: ../dgit.1:631 #, no-wrap msgid "B<-N> | B<--new>" msgstr "" #. type: Plain text -#: ../dgit.1:631 +#: ../dgit.1:637 msgid "" "The package is or may be new in this suite. Without this, dgit will refuse " "to push. It may (for Debian, will) be unable to access the git history for " @@ -1188,13 +1213,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:631 +#: ../dgit.1:637 #, no-wrap msgid "B<--include-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:639 +#: ../dgit.1:645 msgid "" "Do not complain if the working tree does not match your git HEAD, and when " "building, include the changes from your working tree. This can be useful " @@ -1204,24 +1229,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:639 +#: ../dgit.1:645 #, no-wrap msgid "B<--ignore-dirty>" msgstr "" #. type: Plain text -#: ../dgit.1:642 +#: ../dgit.1:648 msgid "Deprecated alias for --include-dirty." msgstr "" #. type: TP -#: ../dgit.1:642 +#: ../dgit.1:648 #, no-wrap msgid "B<--overwrite>[=I<previous-version>]" msgstr "" #. type: Plain text -#: ../dgit.1:653 +#: ../dgit.1:659 msgid "" "Declare that your HEAD really does contain all the (wanted) changes from all " "versions listed in its changelog; or, all (wanted) changes from I<previous-" @@ -1230,14 +1255,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:660 +#: ../dgit.1:666 msgid "" "It is safer not to specify I<previous-version>, and usually it's not " "needed. Just say B<--overwrite>, unless you know what you are doing." msgstr "" #. type: Plain text -#: ../dgit.1:664 +#: ../dgit.1:670 msgid "" "This option is useful if you are the maintainer, and you have incorporated " "NMU changes into your own git workflow in a way that doesn't make your " @@ -1245,14 +1270,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:670 +#: ../dgit.1:676 msgid "" "This option is also usually necessary the first time a package is pushed " "with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>." msgstr "" #. type: Plain text -#: ../dgit.1:684 +#: ../dgit.1:690 msgid "" "If I<previous-version> is not specified, dgit will check that the version in " "the archive is mentioned in your debian/changelog. (This will avoid losing " @@ -1263,7 +1288,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:690 +#: ../dgit.1:696 msgid "" "dgit push --overwrite will, if necessary, make a pseudo-merge (that is, " "something that looks like the result of git merge -s ours) to stitch the " @@ -1272,7 +1297,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:695 +#: ../dgit.1:701 msgid "" "(In quilt mode B<gbp>, B<dpm> or B<unpatched>, implying a split between the " "dgit view and the maintainer view, the pseudo-merge will appear only in the " @@ -1280,18 +1305,18 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:695 +#: ../dgit.1:701 #, no-wrap msgid "B<--delayed>=I<days>" msgstr "" #. type: Plain text -#: ../dgit.1:698 +#: ../dgit.1:704 msgid "Upload to a DELAYED queue." msgstr "" #. type: Plain text -#: ../dgit.1:708 +#: ../dgit.1:714 msgid "" "B<WARNING:> If the maintainer responds by cancelling your upload from the " "queue, and does not make an upload of their own, this will not rewind the " @@ -1301,27 +1326,27 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:713 +#: ../dgit.1:719 msgid "" "If this situation arises, someone should make a suitable dgit push to update " "the contents of dgit-repos to a version without the controversial changes." msgstr "" #. type: TP -#: ../dgit.1:713 +#: ../dgit.1:719 #, no-wrap msgid "B<--no-chase-dsc-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:719 +#: ../dgit.1:725 msgid "" "Tells dgit not to look online for additional git repositories containing " "information about a particular .dsc being imported. Chasing is the default." msgstr "" #. type: Plain text -#: ../dgit.1:729 +#: ../dgit.1:735 msgid "" "For most operations (such as fetch and pull), disabling chasing means dgit " "will access only the git server for the distro you are directly working " @@ -1330,7 +1355,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:737 +#: ../dgit.1:743 msgid "" "Disabling chasing can be hazardous: if the .dsc names a git commit which has " "been rewritten by those in charge of the distro, this option may prevent " @@ -1339,13 +1364,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:737 +#: ../dgit.1:743 #, no-wrap msgid "B<--save-dgit-view=>I<branch>|I<ref>" msgstr "" #. type: Plain text -#: ../dgit.1:747 +#: ../dgit.1:753 msgid "" "Specifies that when a split view quilt mode is in operation, and dgit " "calculates (or looks up in its cache) a dgit view corresponding to your " @@ -1354,7 +1379,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:754 +#: ../dgit.1:760 msgid "" "This option is effective only with the following operations: quilt-fixup; " "push; all builds. And it is only effective with --[quilt=]gbp, --" @@ -1362,25 +1387,25 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:758 +#: ../dgit.1:764 msgid "" "If ref does not start with refs/ it is taken to be a branch - i.e. refs/" "heads/ is prepended." msgstr "" #. type: Plain text -#: ../dgit.1:762 +#: ../dgit.1:768 msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view." msgstr "" #. type: TP -#: ../dgit.1:762 +#: ../dgit.1:768 #, no-wrap msgid "B<--deliberately->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:776 +#: ../dgit.1:782 msgid "" "Declare that you are deliberately doing I<something>. This can be used to " "override safety catches, including safety catches which relate to distro-" @@ -1392,13 +1417,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:776 +#: ../dgit.1:782 #, no-wrap msgid "B<--deliberately-not-fast-forward>" msgstr "" #. type: Plain text -#: ../dgit.1:782 +#: ../dgit.1:788 msgid "" "Declare that you are deliberately rewinding history. When pushing to " "Debian, use this when you are making a renewed upload of an entirely new " @@ -1407,7 +1432,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:793 +#: ../dgit.1:799 msgid "" "In split view quilt modes, this also prevents the construction by dgit of a " "pseudomerge to make the dgit view fast forwarding. Normally only one of --" @@ -1417,13 +1442,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:793 +#: ../dgit.1:799 #, no-wrap msgid "B<--deliberately-include-questionable-history>" msgstr "" #. type: Plain text -#: ../dgit.1:802 +#: ../dgit.1:808 msgid "" "Declare that you are deliberately including, in the git history of your " "current push, history which contains a previously-submitted version of this " @@ -1435,13 +1460,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:802 +#: ../dgit.1:808 #, no-wrap msgid "B<--deliberately-fresh-repo>" msgstr "" #. type: Plain text -#: ../dgit.1:807 +#: ../dgit.1:813 msgid "" "Declare that you are deliberately rewinding history and want to throw away " "the existing repo. Not relevant when pushing to Debian, as the Debian " @@ -1449,13 +1474,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:807 +#: ../dgit.1:813 #, no-wrap msgid "B<--quilt=linear>" msgstr "" #. type: Plain text -#: ../dgit.1:814 +#: ../dgit.1:820 msgid "" "When fixing up source format `3.0 (quilt)' metadata, insist on generating a " "linear patch stack: one new patch for each relevant commit. If such a stack " @@ -1463,20 +1488,20 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:819 +#: ../dgit.1:825 msgid "" "HEAD should be a series of plain commits (not touching debian/patches/), and " "pseudomerges, with as ancestor a patches-applied branch." msgstr "" #. type: TP -#: ../dgit.1:819 +#: ../dgit.1:825 #, no-wrap msgid "B<--quilt=auto>" msgstr "" #. type: Plain text -#: ../dgit.1:828 +#: ../dgit.1:834 msgid "" "When fixing up source format `3.0 (quilt)' metadata, prefer to generate a " "linear patch stack (as with --quilt=auto) but if that doesn't seem " @@ -1486,13 +1511,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:828 +#: ../dgit.1:834 #, no-wrap msgid "B<--quilt=smash>" msgstr "" #. type: Plain text -#: ../dgit.1:833 +#: ../dgit.1:839 msgid "" "When fixing up source format `3.0 (quilt)' metadata, generate a single " "additional patch for all the changes made in git. This is not a good idea " @@ -1500,7 +1525,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:839 +#: ../dgit.1:845 msgid "" "(If HEAD has any in-tree patches already, they must apply cleanly. This " "will be the case for any trees produced by dgit fetch or clone; if you do " @@ -1509,13 +1534,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:839 +#: ../dgit.1:845 #, no-wrap msgid "B<--quilt=nofix>" msgstr "" #. type: Plain text -#: ../dgit.1:847 +#: ../dgit.1:853 msgid "" "Check whether source format `3.0 (quilt)' metadata would need fixing up, " "but, if it does, fail. You must then fix the metadata yourself somehow " @@ -1524,13 +1549,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:847 +#: ../dgit.1:853 #, no-wrap msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>" msgstr "" #. type: Plain text -#: ../dgit.1:852 +#: ../dgit.1:858 msgid "" "Do not check whether up source format `3.0 (quilt)' metadata needs fixing " "up. If you use this option and the metadata did in fact need fixing up, " @@ -1538,20 +1563,20 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:852 +#: ../dgit.1:858 #, no-wrap msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied>" msgstr "" #. type: Plain text -#: ../dgit.1:859 +#: ../dgit.1:865 msgid "" "Tell dgit that you are using a nearly-dgit-compatible git branch, aka a " "B<maintainer view>, and do not want your branch changed by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:867 +#: ../dgit.1:873 msgid "" "B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your " "HEAD is expected to be a patches-unapplied git branch, except that it might " @@ -1560,7 +1585,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:875 +#: ../dgit.1:881 msgid "" "B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is " "expected to be a patches-applied git branch, except that it might contain " @@ -1568,7 +1593,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:880 +#: ../dgit.1:886 msgid "" "B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git " "branch (and that any changes to upstream .gitignore files are represented as " @@ -1576,7 +1601,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:898 +#: ../dgit.1:904 msgid "" "With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup " "and build) will automatically generate a conversion of your git branch into " @@ -1589,7 +1614,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:907 +#: ../dgit.1:913 msgid "" "B<If you have a branch like this it is essential to specify the appropriate " "--quilt= option!> This is because it is not always possible to tell: a " @@ -1601,13 +1626,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:907 +#: ../dgit.1:913 #, no-wrap msgid "B<-d>I<distro> | B<--distro=>I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:916 +#: ../dgit.1:922 msgid "" "Specifies that the suite to be operated on is part of distro I<distro>. " "This overrides the default value found from the git config option B<dgit-" @@ -1617,7 +1642,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:922 +#: ../dgit.1:928 msgid "" "If your suite is part of a distro that dgit already knows about, you can use " "this option to make dgit work even if your dgit doesn't know about the " @@ -1626,7 +1651,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:927 +#: ../dgit.1:933 msgid "" "To define a new distro it is necessary to define methods and URLs for " "fetching (and, for dgit push, altering) a variety of information both in the " @@ -1634,13 +1659,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:927 +#: ../dgit.1:933 #, no-wrap msgid "B<-C>I<changesfile>" msgstr "" #. type: Plain text -#: ../dgit.1:932 +#: ../dgit.1:938 msgid "" "Specifies the .changes file which is to be uploaded. By default dgit push " "looks for single .changes file in the parent directory whose filename " @@ -1648,7 +1673,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:941 +#: ../dgit.1:947 msgid "" "If the specified I<changesfile> pathname contains slashes, the directory " "part is also used as the value for B<--build-products-dir>; otherwise, the " @@ -1656,13 +1681,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:941 +#: ../dgit.1:947 #, no-wrap msgid "B<--rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:953 +#: ../dgit.1:959 msgid "" "When doing a build, delete any changes files matching " "I<package>B<_>I<version>B<_*.changes> before starting. This ensures that " @@ -1674,32 +1699,32 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:956 +#: ../dgit.1:962 msgid "" "Note that B<dgit push-source> will always find the right .changes, " "regardless of this option." msgstr "" #. type: TP -#: ../dgit.1:956 +#: ../dgit.1:962 #, no-wrap msgid "B<--build-products-dir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:960 +#: ../dgit.1:966 msgid "" "Specifies where to find and create tarballs, binary packages, source " "packages, .changes files, and so on." msgstr "" #. type: Plain text -#: ../dgit.1:963 +#: ../dgit.1:969 msgid "By default, dgit uses the parent directory (B<..>)." msgstr "" #. type: Plain text -#: ../dgit.1:972 +#: ../dgit.1:978 msgid "" "Changing this setting may necessitate moving .orig tarballs to the new " "directory, so it is probably best to use the B<dgit.default.build-products-" @@ -1708,37 +1733,37 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:972 +#: ../dgit.1:978 #, no-wrap msgid "B<--no-rm-on-error>" msgstr "" #. type: Plain text -#: ../dgit.1:975 +#: ../dgit.1:981 msgid "Do not delete the destination directory if clone fails." msgstr "" #. type: TP -#: ../dgit.1:975 +#: ../dgit.1:981 #, no-wrap msgid "B<--dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:982 +#: ../dgit.1:988 msgid "" "Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg " "B<archive/debian/>I<version>) where possible. This is the default." msgstr "" #. type: TP -#: ../dgit.1:982 +#: ../dgit.1:988 #, no-wrap msgid "B<--no-dep14tag>" msgstr "" #. type: Plain text -#: ../dgit.1:988 +#: ../dgit.1:994 msgid "" "Do not generate a DEP-14 tag, except in split quilt view mode. (On servers " "where only the old tag format is supported, the dgit tag will have the " @@ -1746,52 +1771,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:988 +#: ../dgit.1:994 #, no-wrap msgid "B<--dep14tag-always>" msgstr "" #. type: Plain text -#: ../dgit.1:993 +#: ../dgit.1:999 msgid "" "Insist on generating a DEP-14 tag as well as a dgit tag. If the server does " "not support that, dgit push will fail." msgstr "" #. type: TP -#: ../dgit.1:993 +#: ../dgit.1:999 #, no-wrap msgid "B<-D>" msgstr "" #. type: Plain text -#: ../dgit.1:997 +#: ../dgit.1:1003 msgid "" "Prints debugging information to stderr. Repeating the option produces more " "output (currently, up to -DDDD is meaningfully different)." msgstr "" #. type: TP -#: ../dgit.1:997 +#: ../dgit.1:1003 #, no-wrap msgid "B<-c>I<name>B<=>I<value>" msgstr "" #. type: Plain text -#: ../dgit.1:1001 +#: ../dgit.1:1007 msgid "" "Specifies a git configuration option, to be used for this run. dgit itself " "is also controlled by git configuration options." msgstr "" #. type: TP -#: ../dgit.1:1001 +#: ../dgit.1:1007 #, no-wrap msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>" msgstr "" #. type: Plain text -#: ../dgit.1:1010 +#: ../dgit.1:1016 msgid "" "Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during " "builds. Changes (from debian/changelog) since this version will be included " @@ -1801,7 +1826,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1016 +#: ../dgit.1:1022 msgid "" "Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-" "genchanges (and as a result, only the last stanza from debian/changelog will " @@ -1809,30 +1834,30 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1016 +#: ../dgit.1:1022 #, no-wrap msgid "B<-m>I<maintaineraddress>" msgstr "" #. type: Plain text -#: ../dgit.1:1019 +#: ../dgit.1:1025 msgid "Passed to dpkg-genchanges (eventually)." msgstr "" #. type: TP -#: ../dgit.1:1019 +#: ../dgit.1:1025 #, no-wrap msgid "B<--ch:>I<option>" msgstr "" #. type: Plain text -#: ../dgit.1:1023 +#: ../dgit.1:1029 msgid "" "Specifies a single additional option to pass, eventually, to dpkg-genchanges." msgstr "" #. type: Plain text -#: ../dgit.1:1030 +#: ../dgit.1:1036 msgid "" "Options which are safe to pass include B<-C> (and also B<-si -sa -sd> " "although these should never be necessary with Debian since dgit " @@ -1840,18 +1865,18 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1032 +#: ../dgit.1:1038 msgid "For other options the caveat below applies." msgstr "" #. type: TP -#: ../dgit.1:1032 +#: ../dgit.1:1038 #, no-wrap msgid "B<--curl:>I<option> | B<--dput:>I<option> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1054 +#: ../dgit.1:1060 msgid "" "Specifies a single additional option to pass to B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1861,7 +1886,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1062 +#: ../dgit.1:1068 msgid "" "Use of this ability should not normally be necessary. It is provided for " "working around bugs, or other unusual situations. If you use these options, " @@ -1870,7 +1895,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1067 +#: ../dgit.1:1073 msgid "" "For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option " "applies only when the program is invoked directly by dgit. Usually, for " @@ -1878,7 +1903,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1071 +#: ../dgit.1:1077 msgid "" "Specifying --git is not effective for some lower-level read-only git " "operations performed by dgit, and also not when git is invoked by another " @@ -1886,25 +1911,53 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1073 +#: ../dgit.1:1079 msgid "See notes below regarding ssh and dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1081 +#: ../dgit.1:1087 msgid "" "NB that --gpg:option is not supported (because debsign does not have that " "facility). But see B<-k> and the B<keyid> distro config setting." msgstr "" #. type: TP -#: ../dgit.1:1081 +#: ../dgit.1:1087 +#, no-wrap +msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1093 +msgid "" +"Specifies an option to remove from the command line for a program called by " +"dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)." +msgstr "" + +#. type: Plain text +#: ../dgit.1:1098 +msgid "" +"Any options or arguments exactly identical to I<option> are removed. (It is " +"not an error if there were none.)" +msgstr "" + +#. type: Plain text +#: ../dgit.1:1105 +msgid "" +"This can only be used to delete options which are always passed by default " +"by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be " +"used to override option(s) dynamically decided on by dgit." +msgstr "" + +#. type: TP +#: ../dgit.1:1105 #, no-wrap msgid "B<--curl=>I<program> | B<--dput=>I<program> |..." msgstr "" #. type: Plain text -#: ../dgit.1:1104 +#: ../dgit.1:1128 msgid "" "Specifies alternative programs to use instead of B<curl>, B<dput>, " "B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, " @@ -1914,14 +1967,14 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1112 +#: ../dgit.1:1136 msgid "" "For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, " "this applies only when the program is invoked directly by dgit." msgstr "" #. type: Plain text -#: ../dgit.1:1119 +#: ../dgit.1:1143 msgid "" "For B<dgit>, specifies the command to run on the remote host when dgit rpush " "needs to invoke a remote copy of itself. (dgit also reinvokes itself as the " @@ -1930,7 +1983,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1130 +#: ../dgit.1:1154 msgid "" "B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The " "default is the latter unless the former exists on PATH.) B<gbp-pq>'s value " @@ -1940,7 +1993,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1138 +#: ../dgit.1:1162 msgid "" "For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo " "-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified " @@ -1948,7 +2001,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1155 +#: ../dgit.1:1179 msgid "" "For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> " "environment variables, if set (see below). And, for ssh, when accessing the " @@ -1960,13 +2013,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1155 +#: ../dgit.1:1179 #, no-wrap msgid "B<--existing-package=>I<package>" msgstr "" #. type: Plain text -#: ../dgit.1:1165 +#: ../dgit.1:1189 msgid "" "dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way " "to ask the archive to do this without knowing the name of an existing " @@ -1977,19 +2030,19 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1165 +#: ../dgit.1:1189 #, no-wrap msgid "B<-h>|B<--help>" msgstr "" #. type: TP -#: ../dgit.1:1168 +#: ../dgit.1:1192 #, no-wrap msgid "B<--initiator-tempdir=>I<directory>" msgstr "" #. type: Plain text -#: ../dgit.1:1177 +#: ../dgit.1:1201 msgid "" "dgit rpush uses a temporary directory on the invoking (signing) host. This " "option causes dgit to use I<directory> instead. Furthermore, the specified " @@ -1999,13 +2052,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1177 +#: ../dgit.1:1201 #, no-wrap msgid "B<--force->I<something>" msgstr "" #. type: Plain text -#: ../dgit.1:1185 +#: ../dgit.1:1209 msgid "" "Instructs dgit to try to proceed despite detecting what it thinks is going " "to be a fatal problem. B<This is probably not going to work.> These options " @@ -2014,13 +2067,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1185 +#: ../dgit.1:1209 #, no-wrap msgid "B<--force-import-dsc-with-dgit-field>" msgstr "" #. type: Plain text -#: ../dgit.1:1192 +#: ../dgit.1:1216 msgid "" "Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. " "The result is a fresh import, discarding the git history that the person who " @@ -2028,26 +2081,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1192 +#: ../dgit.1:1216 #, no-wrap msgid "B<--force-uploading-binaries>" msgstr "" #. type: Plain text -#: ../dgit.1:1197 +#: ../dgit.1:1221 msgid "" "Carry on and upload binaries even though dgit thinks your distro does not " "permit that." msgstr "" #. type: TP -#: ../dgit.1:1197 +#: ../dgit.1:1221 #, no-wrap msgid "B<--force-uploading-source-only>" msgstr "" #. type: Plain text -#: ../dgit.1:1203 +#: ../dgit.1:1227 msgid "" "Carry on and do a source-only upload, without any binaries, even though dgit " "thinks your distro does not permit that, or does not permit that in this " @@ -2055,13 +2108,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1203 +#: ../dgit.1:1227 #, no-wrap msgid "B<--force-unrepresentable>" msgstr "" #. type: Plain text -#: ../dgit.1:1210 +#: ../dgit.1:1234 msgid "" "Carry on even if dgit thinks that your git tree contains changes (relative " "to your .orig tarballs) which dpkg-source is not able to represent. Your " @@ -2069,65 +2122,65 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1210 +#: ../dgit.1:1234 #, no-wrap msgid "B<--force-changes-origs-exactly>" msgstr "" #. type: Plain text -#: ../dgit.1:1215 +#: ../dgit.1:1239 msgid "" "Use the set of .origs specified in your .changes, exactly, without regard to " "what is in the archive already. The archive may well reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1215 +#: ../dgit.1:1239 #, no-wrap msgid "B<--force-unsupported-source-format>" msgstr "" #. type: Plain text -#: ../dgit.1:1219 +#: ../dgit.1:1243 msgid "" "Carry on despite dgit not understanding your source package format. dgit " "will probably mishandle it." msgstr "" #. type: TP -#: ../dgit.1:1219 +#: ../dgit.1:1243 #, no-wrap msgid "B<--force-dsc-changes-mismatch>" msgstr "" #. type: Plain text -#: ../dgit.1:1223 +#: ../dgit.1:1247 msgid "" "Do not check whether .dsc and .changes match. The archive will probably " "reject your upload." msgstr "" #. type: TP -#: ../dgit.1:1223 +#: ../dgit.1:1247 #, no-wrap msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>" msgstr "" #. type: Plain text -#: ../dgit.1:1229 +#: ../dgit.1:1253 msgid "" "Force on or off the use of the absurd git-apply emulation when running gbp " "pq import when importing a package from a .dsc. See Debian bug #841867." msgstr "" #. type: =head1 -#: ../dgit.1:1229 ../dgit-downstream-dsc.7.pod:150 +#: ../dgit.1:1253 ../dgit-downstream-dsc.7.pod:150 #, no-wrap msgid "CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1235 +#: ../dgit.1:1259 msgid "" "dgit can be configured via the git config system. You may set keys with git-" "config (either in system-global or per-tree configuration), or provide B<-" @@ -2135,31 +2188,31 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1237 +#: ../dgit.1:1261 msgid "Settings likely to be useful for an end user include:" msgstr "" #. type: TP -#: ../dgit.1:1237 +#: ../dgit.1:1261 #, no-wrap msgid "B<dgit.default.build-products-dir>" msgstr "" #. type: Plain text -#: ../dgit.1:1243 +#: ../dgit.1:1267 msgid "" "Specifies where to find the built files to be uploaded, when --build-" "products-dir is not specified. The default is the parent directory (B<..>)." msgstr "" #. type: =item -#: ../dgit.1:1243 ../dgit-downstream-dsc.7.pod:286 +#: ../dgit.1:1267 ../dgit-downstream-dsc.7.pod:286 #, no-wrap msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1248 +#: ../dgit.1:1272 msgid "" "Specifies the distro for a suite. dgit keys off the suite name (which " "appears in changelogs etc.), and uses that to determine the distro which is " @@ -2167,66 +2220,66 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1251 +#: ../dgit.1:1275 msgid "I<suite> may be a glob pattern." msgstr "" #. type: TP -#: ../dgit.1:1251 +#: ../dgit.1:1275 #, no-wrap msgid "B<dgit.default.distro>I< distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1254 +#: ../dgit.1:1278 msgid "The default distro for an unknown suite." msgstr "" #. type: TP -#: ../dgit.1:1254 +#: ../dgit.1:1278 #, no-wrap msgid "B<dgit.default.default-suite>I< suite>" msgstr "" #. type: Plain text -#: ../dgit.1:1257 +#: ../dgit.1:1281 msgid "The default suite (eg for clone)." msgstr "" #. type: TP -#: ../dgit.1:1257 +#: ../dgit.1:1281 #, no-wrap msgid "B<dgit.default.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1262 +#: ../dgit.1:1286 msgid "" "for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is " "no distro-specific setting." msgstr "" #. type: TP -#: ../dgit.1:1262 +#: ../dgit.1:1286 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1266 +#: ../dgit.1:1290 msgid "" "One of the values for the command line --clean= option; used if --clean is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1266 +#: ../dgit.1:1290 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>" msgstr "" #. type: Plain text -#: ../dgit.1:1272 +#: ../dgit.1:1296 msgid "" "Like .clean-mode, but ignored if the value does not make sense to this " "version of dgit. Setting both .clean-mode and .clean-mode-newer is useful " @@ -2234,39 +2287,39 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1272 +#: ../dgit.1:1296 #, no-wrap -msgid "B<dgit-distro.>I<distro>B<.quilt->" +msgid "B<dgit-distro.>I<distro>B<.quilt-mode>" msgstr "" #. type: Plain text -#: ../dgit.1:1276 +#: ../dgit.1:1300 msgid "" "One of the values for the command line --quilt= option; used if --quilt is " "not specified." msgstr "" #. type: TP -#: ../dgit.1:1276 +#: ../dgit.1:1300 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>" msgstr "" #. type: Plain text -#: ../dgit.1:1280 +#: ../dgit.1:1304 msgid "" "Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is " "specified. The default is not to remove." msgstr "" #. type: TP -#: ../dgit.1:1280 +#: ../dgit.1:1304 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>" msgstr "" #. type: Plain text -#: ../dgit.1:1287 +#: ../dgit.1:1311 msgid "" "Whether you have push access to the distro. For Debian, it is OK to use " "auto, which uses readonly mode if you are not pushing right now; but, " @@ -2275,52 +2328,52 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1287 +#: ../dgit.1:1311 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.keyid>" msgstr "" #. type: Plain text -#: ../dgit.1:1291 +#: ../dgit.1:1315 msgid "See also B<-k>." msgstr "" #. type: TP -#: ../dgit.1:1291 +#: ../dgit.1:1315 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>" msgstr "" #. type: TP -#: ../dgit.1:1293 +#: ../dgit.1:1317 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.username>" msgstr "" #. type: Plain text -#: ../dgit.1:1296 +#: ../dgit.1:1320 msgid "Not relevant for Debian." msgstr "" #. type: =item -#: ../dgit.1:1296 ../dgit-downstream-dsc.7.pod:242 +#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.upload-host>" msgstr "" #. type: Plain text -#: ../dgit.1:1299 +#: ../dgit.1:1323 msgid "Might be useful if you have an intermediate queue server." msgstr "" #. type: TP -#: ../dgit.1:1299 +#: ../dgit.1:1323 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>" msgstr "" #. type: Plain text -#: ../dgit.1:1304 +#: ../dgit.1:1328 msgid "" "Values to configure for user.name and user.email in new git trees. If not " "specified, the DEBFULLNAME and DEBEMAIL environment variables are used, " @@ -2328,26 +2381,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1304 +#: ../dgit.1:1328 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-useremail>" msgstr "" #. type: Plain text -#: ../dgit.1:1308 +#: ../dgit.1:1332 msgid "" "Whether to set user.name and user.email in new git trees. True by default. " "Ignored for dgit setup-setup-useremail, which does it anyway." msgstr "" #. type: TP -#: ../dgit.1:1308 +#: ../dgit.1:1332 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>" msgstr "" #. type: Plain text -#: ../dgit.1:1313 +#: ../dgit.1:1337 msgid "" "Whether to setup a merge driver which uses dpkg-mergechangelogs for debian/" "changelog. True by default. Ignored for dgit setup-mergechangelogs, which " @@ -2355,13 +2408,13 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1313 +#: ../dgit.1:1337 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>" msgstr "" #. type: Plain text -#: ../dgit.1:1319 +#: ../dgit.1:1343 msgid "" "Whether to configure .git/info/attributes to suppress checkin/checkout file " "content transformations in new git trees. True by default. Ignored for " @@ -2369,24 +2422,24 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1319 +#: ../dgit.1:1343 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1325 +#: ../dgit.1:1349 msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ." msgstr "" #. type: TP -#: ../dgit.1:1325 +#: ../dgit.1:1349 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>" msgstr "" #. type: Plain text -#: ../dgit.1:1336 +#: ../dgit.1:1360 msgid "" "Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass " "several options, configure multiple values in git config (with git config --" @@ -2396,13 +2449,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1336 +#: ../dgit.1:1360 #, no-wrap msgid "ACCESS CONFIGURATION" msgstr "" #. type: Plain text -#: ../dgit.1:1341 +#: ../dgit.1:1365 msgid "" "There are many other settings which specify how a particular distro's " "services (archive and git) are provided. These should not normally be " @@ -2411,204 +2464,204 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1341 +#: ../dgit.1:1365 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.nominal-distro>" msgstr "" #. type: Plain text -#: ../dgit.1:1344 +#: ../dgit.1:1368 msgid "Shown in git tags, Dgit fields, and so on." msgstr "" #. type: TP -#: ../dgit.1:1344 +#: ../dgit.1:1368 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.alias-canon>" msgstr "" #. type: Plain text -#: ../dgit.1:1347 +#: ../dgit.1:1371 msgid "Used for all access configuration lookup." msgstr "" #. type: TP -#: ../dgit.1:1347 +#: ../dgit.1:1371 #, no-wrap msgid "B<dgit-distro.>I<distro>B</push.>*" msgstr "" #. type: Plain text -#: ../dgit.1:1353 +#: ../dgit.1:1377 msgid "" "If set, overrides corresponding non B</push> config when B<readonly=false>, " "or when pushing and B<readonly=auto>." msgstr "" #. type: TP -#: ../dgit.1:1353 +#: ../dgit.1:1377 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>" msgstr "" #. type: TP -#: ../dgit.1:1355 +#: ../dgit.1:1379 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]" msgstr "" #. type: TP -#: ../dgit.1:1357 +#: ../dgit.1:1381 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-proto>" msgstr "" #. type: TP -#: ../dgit.1:1359 +#: ../dgit.1:1383 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-path>" msgstr "" #. type: TP -#: ../dgit.1:1361 +#: ../dgit.1:1385 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>" msgstr "" #. type: TP -#: ../dgit.1:1363 +#: ../dgit.1:1387 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1365 +#: ../dgit.1:1389 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>" msgstr "" #. type: TP -#: ../dgit.1:1367 +#: ../dgit.1:1391 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>" msgstr "" #. type: TP -#: ../dgit.1:1369 +#: ../dgit.1:1393 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>" msgstr "" #. type: TP -#: ../dgit.1:1371 +#: ../dgit.1:1395 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)" msgstr "" #. type: TP -#: ../dgit.1:1373 +#: ../dgit.1:1397 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.madison-distro>" msgstr "" #. type: TP -#: ../dgit.1:1375 +#: ../dgit.1:1399 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>" msgstr "" #. type: TP -#: ../dgit.1:1377 +#: ../dgit.1:1401 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>" msgstr "" #. type: TP -#: ../dgit.1:1379 +#: ../dgit.1:1403 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>" msgstr "" #. type: TP -#: ../dgit.1:1381 +#: ../dgit.1:1405 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.ssh>" msgstr "" #. type: TP -#: ../dgit.1:1383 +#: ../dgit.1:1407 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>" msgstr "" #. type: TP -#: ../dgit.1:1385 +#: ../dgit.1:1409 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)" msgstr "" #. type: TP -#: ../dgit.1:1387 +#: ../dgit.1:1411 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.backports-quirk>" msgstr "" #. type: TP -#: ../dgit.1:1389 +#: ../dgit.1:1413 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>" msgstr "" #. type: TP -#: ../dgit.1:1391 +#: ../dgit.1:1415 #, no-wrap msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>" msgstr "" #. type: TP -#: ../dgit.1:1393 +#: ../dgit.1:1417 #, no-wrap msgid "B<dgit.default.old-dsc-distro>" msgstr "" #. type: TP -#: ../dgit.1:1395 +#: ../dgit.1:1419 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.>I<protocol>" msgstr "" #. type: TP -#: ../dgit.1:1397 +#: ../dgit.1:1421 #, no-wrap msgid "B<dgit.dsc-url-proto-ok.bad-syntax>" msgstr "" #. type: TP -#: ../dgit.1:1399 +#: ../dgit.1:1423 #, no-wrap msgid "B<dgit.default.dsc-url-proto-ok>" msgstr "" #. type: TP -#: ../dgit.1:1401 +#: ../dgit.1:1425 #, no-wrap msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]" msgstr "" #. type: SH -#: ../dgit.1:1403 +#: ../dgit.1:1427 #, no-wrap msgid "ENVIRONMENT VARIABLES" msgstr "" #. type: TP -#: ../dgit.1:1404 +#: ../dgit.1:1428 #, no-wrap msgid "B<DGIT_SSH>, B<GIT_SSH>" msgstr "" #. type: Plain text -#: ../dgit.1:1413 +#: ../dgit.1:1437 msgid "" "specify an alternative default program (and perhaps arguments) to use " "instead of ssh. DGIT_SSH is consulted first and may contain arguments; if " @@ -2618,26 +2671,26 @@ msgid "" msgstr "" #. type: TP -#: ../dgit.1:1413 +#: ../dgit.1:1437 #, no-wrap msgid "B<DEBEMAIL>, B<DEBFULLNAME>" msgstr "" #. type: Plain text -#: ../dgit.1:1417 +#: ../dgit.1:1441 msgid "" "Default git user.email and user.name for new trees. See B<dgit setup-new-" "tree>." msgstr "" #. type: TP -#: ../dgit.1:1417 +#: ../dgit.1:1441 #, no-wrap msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>" msgstr "" #. type: Plain text -#: ../dgit.1:1422 +#: ../dgit.1:1446 msgid "" "and other subprograms and modules used by dgit are affected by various " "environment variables. Consult the documentation for those programs for " @@ -2645,13 +2698,13 @@ msgid "" msgstr "" #. type: SH -#: ../dgit.1:1422 +#: ../dgit.1:1446 #, no-wrap msgid "BUGS" msgstr "" #. type: Plain text -#: ../dgit.1:1429 +#: ../dgit.1:1453 msgid "" "There should be a `dgit rebase-prep' command or some such to turn a fast-" "forwarding branch containing pseudo-merges back into a rebasing patch " @@ -2659,7 +2712,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1435 +#: ../dgit.1:1459 msgid "" "If the dgit push fails halfway through, it is not necessarily restartable " "and idempotent. It would be good to check that the proposed signing key is " @@ -2667,7 +2720,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1440 +#: ../dgit.1:1464 msgid "" "dgit's build functions, and dgit push, may make changes to your current " "HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source " @@ -2676,7 +2729,7 @@ msgid "" msgstr "" #. type: Plain text -#: ../dgit.1:1445 +#: ../dgit.1:1469 msgid "" "--dry-run does not always work properly, as not doing some of the git " "fetches may result in subsequent actions being different. Doing a non-dry-" @@ -2684,24 +2737,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../dgit.1:1445 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1469 ../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:598 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" msgstr "" #. type: Plain text -#: ../dgit.1:1454 +#: ../dgit.1:1478 msgid "" "B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-" "config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1)," msgstr "" #. type: Plain text -#: ../dgit.1:1455 +#: ../dgit.1:1479 msgid "https://browse.dgit.debian.org/" msgstr "" diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot index 72f8b5a..630039b 100644 --- a/po4a/git-debrebase_1.pot +++ b/po4a/git-debrebase_1.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2018-10-04 12:36+0100\n" +"POT-Creation-Date: 2019-01-06 17: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" @@ -27,17 +27,17 @@ msgid "NAME" msgstr "" #. type: =head1 -#: ../dgit.1:496 ../git-debrebase.1.pod:441 +#: ../dgit.1:496 ../git-debrebase.1.pod:462 #, no-wrap msgid "OPTIONS" msgstr "" #. type: =head1 -#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447 +#: ../dgit.1:1469 ../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:598 +#: ../dgit-maint-debrebase.7.pod:747 ../dgit-downstream-dsc.7.pod:352 +#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619 #: ../git-debrebase.5.pod:678 #, no-wrap msgid "SEE ALSO" @@ -468,27 +468,54 @@ msgstr "" #. type: =item #: ../git-debrebase.1.pod:257 +msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]" +msgstr "" + +#. type: =item +#: ../git-debrebase.1.pod:259 msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:259 +#: ../git-debrebase.1.pod:261 +msgid "Cnnverts any of the following into a git-debrebase interchange branch:" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:267 +msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:271 msgid "" -"Cnnverts a gbp patches-unapplied branch (not a gbp pq patch queue branch) " -"into a git-debrebase interchange branch." +"a patches-unapplied git packaging branch containing debian/patches, as used " +"with quilt" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:263 +#: ../git-debrebase.1.pod:276 msgid "" -"This is done by generating a new anchor merge, converting the quilt patches " -"as a delta queue, and dropping the patches from the tree." +"a git branch for a package which has no Debian delta - ie where upstream " +"files are have not been modified in Debian, so there are no patches" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:267 +#: ../git-debrebase.1.pod:282 +msgid "(These two commands operate identically and are simply aliases.)" +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:284 msgid "" -"The upstream commit-ish should correspond to the gbp upstream branch, if " +"The conversion is done by generating a new anchor merge, converting any " +"quilt patches as a delta queue, and dropping the patches from the tree." +msgstr "" + +#. type: textblock +#: ../git-debrebase.1.pod:288 +msgid "" +"The upstream commit-ish should correspond to the upstream branch or tag, if " "there is one. It is a snag if it is not an ancestor of HEAD, or if the " "history between the upstream and HEAD contains commits which make changes to " "upstream files. If it is not specified, the same algorithm is used as for " @@ -496,7 +523,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:275 +#: ../git-debrebase.1.pod:296 msgid "" "It is also a snag if the specified upstream has a debian/ subdirectory. " "This check exists to detect certain likely user errors, but if this " @@ -504,7 +531,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:281 +#: ../git-debrebase.1.pod:302 msgid "" "git-debrebase will try to look for the dgit archive view of the most recent " "release, and if it finds it will make a pseduomerge so that your new git-" @@ -512,14 +539,14 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:286 +#: ../git-debrebase.1.pod:307 msgid "" "The result is a well-formed git-debrebase interchange branch. The result is " -"also fast-forward from the gbp branch." +"also fast-forward from the original branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:289 +#: ../git-debrebase.1.pod:310 msgid "" "It is a snag if the new branch looks like it will have diverged, just as for " "a laundering/unstitching call to git-debrebase; See L</Establish the current " @@ -527,48 +554,48 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:293 +#: ../git-debrebase.1.pod:314 msgid "" -"Note that it is dangerous not to know whether you are dealing with a gbp " +"Note that it is dangerous not to know whether you are dealing with a (gbp) " "patches-unapplied branch containing quilt patches, or a git-debrebase " "interchange branch. At worst, using the wrong tool for the branch format " "might result in a dropped patch queue!" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:302 +#: ../git-debrebase.1.pod:323 msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:306 +#: ../git-debrebase.1.pod:327 msgid "git-debrebase breakwater" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:308 +#: ../git-debrebase.1.pod:329 msgid "" "Prints the breakwater tip commitid. If your HEAD branch is not fully " "laundered, prints the tip of the so-far-laundered breakwater." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:312 +#: ../git-debrebase.1.pod:333 msgid "git-debrebase anchor" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:314 +#: ../git-debrebase.1.pod:335 msgid "Prints the breakwater anchor commitid." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:316 +#: ../git-debrebase.1.pod:337 msgid "git-debrebase analyse" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:318 +#: ../git-debrebase.1.pod:339 msgid "" "Walks the history of the current branch, most recent commit first, back " "until the most recent anchor, printing the commit object id, and commit type " @@ -576,31 +603,31 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:326 +#: ../git-debrebase.1.pod:347 msgid "git-debrebase record-ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:328 +#: ../git-debrebase.1.pod:349 msgid "" "Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING " "AND LAUNDERING>, but does not launder the branch or move HEAD." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:332 +#: ../git-debrebase.1.pod:353 msgid "" "It is an error if the ffq-prev could not be recorded. It is also an error " "if an ffq-prev has already been recorded, unless --noop-ok." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:336 +#: ../git-debrebase.1.pod:357 msgid "git-debrebase launder-v0" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:338 +#: ../git-debrebase.1.pod:359 msgid "" "Launders the branch without recording anything in ffq-prev. Then prints " "some information about the current branch. Do not use this operation; it " @@ -608,12 +635,12 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:343 +#: ../git-debrebase.1.pod:364 msgid "git-debrebase convert-to-gbp" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:345 +#: ../git-debrebase.1.pod:366 msgid "" "Converts a laundered branch into a gbp patches-unapplied branch containing " "quilt patches. The result is not fast forward from the interchange branch, " @@ -621,7 +648,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:350 +#: ../git-debrebase.1.pod:371 msgid "" "This is provided mostly for the test suite and for unusual situations. It " "should only be used with a care and with a proper understanding of the " @@ -629,19 +656,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:355 +#: ../git-debrebase.1.pod:376 msgid "" "Be sure to not accidentally treat the result as a git-debrebase branch, or " "you will drop all the patches!" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:359 +#: ../git-debrebase.1.pod:380 msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:361 +#: ../git-debrebase.1.pod:382 msgid "" "Converts any dgit-compatible git branch corresponding to a (possibly " "hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible " @@ -649,7 +676,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:365 +#: ../git-debrebase.1.pod:386 msgid "" "This operation should not be used if the branch is already in git-debrebase " "form. Normally git-debrebase will refuse to continue in this case (or " @@ -657,7 +684,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:370 +#: ../git-debrebase.1.pod:391 msgid "" "Some representation of the original upstream source code will be needed. If " "I<upstream> is supplied, that must be a suitable upstream commit. By " @@ -666,7 +693,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:376 +#: ../git-debrebase.1.pod:397 msgid "" "The upstream source must be exactly right and all the patches in debian/" "patches must be up to date. Applying the patches from debian/patches to the " @@ -674,7 +701,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:381 +#: ../git-debrebase.1.pod:402 msgid "" "The output is laundered and stitched. The resulting history is not " "particularly pretty, especially if orig tarball(s) were imported to produce " @@ -682,31 +709,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:386 +#: ../git-debrebase.1.pod:407 msgid "" "The available convert-options are as follows. (These must come after " "convert-from-dgit-view.)" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:391 +#: ../git-debrebase.1.pod:412 msgid "--[no-]diagnose" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:393 +#: ../git-debrebase.1.pod:414 msgid "" "Print additional error messages to help diagnose failure to find an " "appropriate upstream. --no-diagnose is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:397 +#: ../git-debrebase.1.pod:418 msgid "--build-products-dir" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:399 +#: ../git-debrebase.1.pod:420 msgid "" "Directory to look in for orig tarballs. The default is the git config " "option dgit.default.build-products-dir or failing that, C<..>. Passed on to " @@ -714,35 +741,35 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:405 +#: ../git-debrebase.1.pod:426 msgid "--[no-]origs" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:407 +#: ../git-debrebase.1.pod:428 msgid "" "Whether to try to look for or use any orig tarballs. --origs is the default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:410 +#: ../git-debrebase.1.pod:431 msgid "--[no-]tags" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:412 +#: ../git-debrebase.1.pod:433 msgid "" "Whether to try to look for or use any upstream git tags. --tags is the " "default." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:415 +#: ../git-debrebase.1.pod:436 msgid "--always-convert-anyway" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:417 +#: ../git-debrebase.1.pod:438 msgid "" "Perform the conversion operation, producing unpleasant extra history, even " "if the branch seems to be in git-debrebase form already. This should not be " @@ -750,12 +777,12 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:425 +#: ../git-debrebase.1.pod:446 msgid "git-debrebase forget-was-ever-debrebase" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:427 +#: ../git-debrebase.1.pod:448 msgid "" "Deletes the ffq-prev and debrebase-last refs associated with this branch, " "that git-debrebase and dgit use to determine whether this branch is managed " @@ -763,19 +790,19 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:433 +#: ../git-debrebase.1.pod:454 msgid "" "This can be useful if you were just playing with git-debrebase, and have " "used git-reset --hard to go back to a commit before your experiments." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:437 +#: ../git-debrebase.1.pod:458 msgid "Do not use this if you expect to run git-debrebase on the branch again." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:443 +#: ../git-debrebase.1.pod:464 msgid "" "This section documents the general options to git-debrebase (ie, the ones " "which immediately follow git-debrebase or git debrebase on the command " @@ -784,78 +811,78 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:455 +#: ../git-debrebase.1.pod:476 msgid "-f<snag-id>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:457 +#: ../git-debrebase.1.pod:478 msgid "Turns snag(s) with id <snag-id> into warnings." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:459 +#: ../git-debrebase.1.pod:480 msgid "" "Some troublesome things which git-debrebase encounters are B<snag>s. (The " "specific instances are discussed in the text for the relevant operation.)" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:464 +#: ../git-debrebase.1.pod:485 msgid "" "When a snag is detected, a message is printed to stderr containing the snag " "id (in the form C<-f<snag-idE<gt>>), along with some prose." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:469 +#: ../git-debrebase.1.pod:490 msgid "" "If snags are detected, git-debrebase does not continue, unless the relevant -" "f<snag-id> is specified, or --force is specified." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:473 +#: ../git-debrebase.1.pod:494 msgid "--force" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:475 +#: ../git-debrebase.1.pod:496 msgid "Turns all snags into warnings. See the -f<snag-id> option." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:478 +#: ../git-debrebase.1.pod:499 msgid "" "Do not invoke git-debrebase --force in scripts and aliases; instead, specify " "the particular -f<snag-id> for expected snags." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:481 +#: ../git-debrebase.1.pod:502 msgid "--noop-ok" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:483 +#: ../git-debrebase.1.pod:504 msgid "" "Suppresses the error in some situations where git-debrebase does nothing, " "because there is nothing to do." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:487 +#: ../git-debrebase.1.pod:508 msgid "" "The specific instances are discussed in the text for the relvant operation." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:490 +#: ../git-debrebase.1.pod:511 msgid "--anchor=<commit-ish>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:492 +#: ../git-debrebase.1.pod:513 msgid "" "Treats <commit-ish> as an anchor. This overrides the usual logic which " "automatically classifies commits as anchors, pseudomerges, delta queue " @@ -863,7 +890,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:496 +#: ../git-debrebase.1.pod:517 msgid "" "It also disables some coherency checks which depend on metadata extracted " "from its commit message, so it is a snag if <commit-ish> is the anchor for " @@ -871,41 +898,41 @@ msgid "" msgstr "" #. type: =item -#: ../git-debrebase.1.pod:503 +#: ../git-debrebase.1.pod:524 msgid "--dgit=<program>" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:505 +#: ../git-debrebase.1.pod:526 msgid "" "Run <program>, instead of dgit from PATH, when invocation of dgit is " "necessary. This is provided mostly for the benefit of the test suite." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:509 +#: ../git-debrebase.1.pod:530 msgid "-D" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:511 +#: ../git-debrebase.1.pod:532 msgid "Requests (more) debugging. May be repeated." msgstr "" #. type: =item -#: ../git-debrebase.1.pod:513 +#: ../git-debrebase.1.pod:534 msgid "--experimntal-merge-resolution" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:515 +#: ../git-debrebase.1.pod:536 msgid "" "Enable experimental code for handling general merges (see L<git-debrebase(5)/" "General merges>)." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:518 +#: ../git-debrebase.1.pod:539 msgid "" "This option may generate lossage of various kinds, including misleading " "error messages, references to nonexistent documentation, and you being " @@ -913,24 +940,24 @@ msgid "" msgstr "" #. type: =head1 -#: ../git-debrebase.1.pod:526 +#: ../git-debrebase.1.pod:547 msgid "UNSTITCHING AND LAUNDERING" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:528 +#: ../git-debrebase.1.pod:549 msgid "" "Several operations unstitch and launder the branch first. In detail this " "means:" msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:531 +#: ../git-debrebase.1.pod:552 msgid "Establish the current branch's ffq-prev" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:533 +#: ../git-debrebase.1.pod:554 msgid "" "If ffq-prev is not yet recorded, git-debrebase checks that the current " "branch is ahead of relevant remote tracking branches. The relevant branches " @@ -938,30 +965,30 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:545 +#: ../git-debrebase.1.pod:566 msgid "" "The branch that git would merge from (remote.<branch>.merge, remote.<branch>." "remote);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:550 +#: ../git-debrebase.1.pod:571 msgid "" "The branch git would push to, if different (remote.<branch>.pushRemote etc.);" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:555 +#: ../git-debrebase.1.pod:576 msgid "For local dgit suite branches, the corresponding tracking remote;" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:560 +#: ../git-debrebase.1.pod:581 msgid "If you are on C<master>, remotes/dgit/dgit/sid." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:565 +#: ../git-debrebase.1.pod:586 msgid "" "The apparently relevant ref names to check are filtered through branch." "<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, " @@ -969,7 +996,7 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:570 +#: ../git-debrebase.1.pod:591 msgid "" "In each case it is a snag if the local HEAD is behind the checked remote, or " "if local HEAD has diverged from it. All the checks are done locally using " @@ -978,31 +1005,31 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:576 +#: ../git-debrebase.1.pod:597 msgid "" "If these checks pass, or are forced, git-debrebse then records the current " "tip as ffq-prev." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:580 +#: ../git-debrebase.1.pod:601 msgid "Examine the branch" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:582 +#: ../git-debrebase.1.pod:603 msgid "" "git-debrebase analyses the current HEAD's history to find the anchor in its " "breakwater, and the most recent breakwater tip." msgstr "" #. type: =head2 -#: ../git-debrebase.1.pod:587 +#: ../git-debrebase.1.pod:608 msgid "Rewrite the commits into laundered form" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:589 +#: ../git-debrebase.1.pod:610 msgid "" "Mixed debian+upstream commits are split into two commits each. Delta queue " "(upstream files) commits bubble to the top. Pseudomerges, and quilt patch " @@ -1010,13 +1037,13 @@ msgid "" msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:595 +#: ../git-debrebase.1.pod:616 msgid "" "This rewrite will always succeed, by construction. The result is the " "laundered branch." msgstr "" #. type: textblock -#: ../git-debrebase.1.pod:600 +#: ../git-debrebase.1.pod:621 msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1), gitglossary(7)" msgstr "" |