msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-09-08 20:11+0100\n"
+"POT-Creation-Date: 2020-02-02 16:50+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
msgstr ""
#. type: =head1
-#: ../dgit.1:1568 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1575 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
-#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
-#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
-#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
-#: ../git-debpush.1.pod:254
+#: ../dgit-maint-merge.7.pod:524 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:782 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:140
+#: ../git-debrebase.1.pod:634 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:261
#, no-wrap
msgid "SEE ALSO"
msgstr ""
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361
-#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67
-#: ../dgit-maint-debrebase.7.pod:352
+#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:362
+#: ../dgit-maint-merge.7.pod:441 ../dgit-maint-debrebase.7.pod:67
+#: ../dgit-maint-debrebase.7.pod:354
msgid "When upstream tags releases in git"
msgstr ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432
-#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419
+#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:435
+#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:423
#, no-wrap
msgid ""
" % git deborig\n"
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373
-#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163
-#: ../dgit-maint-debrebase.7.pod:364
+#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:374
+#: ../dgit-maint-merge.7.pod:466 ../dgit-maint-debrebase.7.pod:163
+#: ../dgit-maint-debrebase.7.pod:366
msgid "When upstream releases only tarballs"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171
-#, no-wrap
-msgid ""
-" % mkdir foo\n"
-" % cd foo\n"
-" % git init\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177
-msgid "Now create I<debian/gbp.conf>:"
-msgstr ""
-
-#. type: verbatim
-#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
+#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:208
#, no-wrap
msgid ""
" [DEFAULT]\n"
" upstream-branch = upstream\n"
" debian-branch = master\n"
-" upstream-tag = %(version)s\n"
+" upstream-tag = upstream/%(version)s\n"
"\n"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186
+#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:213
#, no-wrap
msgid ""
" sign-tags = True\n"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190
-#, no-wrap
-msgid ""
-" [import-orig]\n"
-" merge-mode = merge\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
-msgid "gbp-import-orig(1) requires a pre-existing upstream branch:"
-msgstr ""
-
-#. type: verbatim
-#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199
-#, no-wrap
-msgid ""
-" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n"
-" % git checkout --orphan upstream\n"
-" % git rm -rf .\n"
-" % git commit --allow-empty -m \"initial, empty branch for upstream source\"\n"
-" % git checkout -f master\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207
-msgid "Then we can import the upstream version:"
-msgstr ""
-
-#. type: verbatim
-#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211
-#, no-wrap
-msgid ""
-" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n"
-"\n"
-msgstr ""
-
-#. type: textblock
-#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215
-msgid ""
-"Our upstream branch cannot be pushed to B<dgit-repos>, but since we will "
-"need it whenever we import a new upstream version, we must push it "
-"somewhere. The usual choice is B<salsa.debian.org>:"
-msgstr ""
-
-#. type: verbatim
-#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221
+#: ../dgit-maint-merge.7.pod:207 ../dgit-maint-debrebase.7.pod:191
#, no-wrap
msgid ""
" % git remote add -f origin salsa.debian.org:Debian/foo.git\n"
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233
+#: ../dgit-maint-merge.7.pod:215 ../dgit-maint-debrebase.7.pod:235
msgid "CONVERTING AN EXISTING PACKAGE"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235
+#: ../dgit-maint-merge.7.pod:217 ../dgit-maint-debrebase.7.pod:237
msgid ""
"This section explains how to convert an existing Debian package to this "
"workflow. It should be skipped when debianising a new package."
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266
+#: ../dgit-maint-merge.7.pod:256 ../dgit-maint-debrebase.7.pod:268
#, no-wrap
msgid ""
" % git remote add -f upstream https://some.upstream/foo.git\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320
+#: ../dgit-maint-merge.7.pod:269 ../dgit-maint-debrebase.7.pod:322
msgid ""
"To achieve this, you might need to delete I<debian/source/local-options>. "
"One way to have dgit check your progress is to run B<dgit build-source>."
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472
+#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:476
msgid "BUILDING AND UPLOADING"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350
+#: ../dgit-maint-merge.7.pod:360 ../dgit-maint-debrebase.7.pod:352
msgid "Obtaining the release"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
+#: ../dgit-maint-merge.7.pod:366 ../dgit-maint-debrebase.7.pod:358
#, no-wrap
msgid ""
" % git fetch --tags upstream\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360
+#: ../dgit-maint-merge.7.pod:370 ../dgit-maint-debrebase.7.pod:362
msgid ""
"If you want to package an untagged upstream commit (because upstream does "
"not tag releases or because you want to package an upstream development "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366
+#: ../dgit-maint-merge.7.pod:376 ../dgit-maint-debrebase.7.pod:368
msgid ""
"You will need the I<debian/gbp.conf> from \"When upstream releases only "
"tarballs\", above. You will also need your upstream branch. Above, we "
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371
+#: ../dgit-maint-merge.7.pod:381 ../dgit-maint-debrebase.7.pod:373
msgid "Then, either"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375
+#: ../dgit-maint-merge.7.pod:385 ../dgit-maint-debrebase.7.pod:377
#, no-wrap
msgid ""
-" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n"
+" % gbp import-orig ../foo_1.2.3.orig.tar.xz\n"
"\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379
+#: ../dgit-maint-merge.7.pod:389 ../dgit-maint-debrebase.7.pod:381
msgid "or if you have a working watch file"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383
+#: ../dgit-maint-merge.7.pod:393 ../dgit-maint-debrebase.7.pod:385
#, no-wrap
msgid ""
-" % gbp import-orig --no-merge --uscan\n"
+" % gbp import-orig --uscan\n"
"\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413
+#: ../dgit-maint-merge.7.pod:429 ../dgit-maint-debrebase.7.pod:417
msgid ""
"If you obtained a tarball from upstream, you are ready to try a build. If "
"you merged a git tag from upstream, you will first need to generate a "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503
+#: ../dgit-maint-merge.7.pod:439 ../dgit-maint-debrebase.7.pod:507
msgid "HANDLING DFSG-NON-FREE MATERIAL"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577
+#: ../dgit-maint-merge.7.pod:468 ../dgit-maint-debrebase.7.pod:581
msgid ""
"The easiest way to handle this is to add a B<Files-Excluded> field to "
"I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. "
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130
-#: ../dgit-maint-debrebase.7.pod:582
+#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:130
+#: ../dgit-maint-debrebase.7.pod:586
msgid "INCORPORATING NMUS"
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
-#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
-#: ../git-debpush.1.pod:259
+#: ../dgit-maint-merge.7.pod:528 ../dgit-maint-gbp.7.pod:140
+#: ../dgit-maint-debrebase.7.pod:786 ../dgit-maint-bpo.7.pod:144
+#: ../git-debpush.1.pod:266
msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784
+#: ../dgit-maint-merge.7.pod:530 ../dgit-maint-debrebase.7.pod:788
msgid ""
"This tutorial was written and is maintained by Sean Whitton "
"<spwhitton@spwhitton.name>. It contains contributions from other dgit "
msgstr ""
#. type: =head1
-#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:324
+#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:326
msgid "GIT CONFIGURATION"
msgstr ""
"virtual release tags. gbp-import-orig(1) can manage this for us. To begin"
msgstr ""
+#. type: verbatim
+#: ../dgit-maint-debrebase.7.pod:171
+#, no-wrap
+msgid ""
+" % mkdir foo\n"
+" % cd foo\n"
+" % git init\n"
+" % git checkout -b upstream\n"
+" % gbp import-orig \\\n"
+" --upstream-branch=upstream --debian-branch=master \\\n"
+" --upstream-tag='upstream/%(version)s' \\\n"
+" --sign-tags --no-pristine-tar \\\n"
+" ../foo_1.2.2.orig.tar.xz\n"
+" % git branch -f upstream\n"
+"\n"
+msgstr ""
+
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:226
+#: ../dgit-maint-debrebase.7.pod:184
+msgid ""
+"This should leave you on the master branch. Next, our upstream branch "
+"cannot be pushed to B<dgit-repos>, but since we will need it whenever we "
+"import a new upstream version, we must push it somewhere. The usual choice "
+"is B<salsa.debian.org>:"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-debrebase.7.pod:196
msgid ""
"You are now ready to proceed as above, making commits to the I<debian/> "
"directory and to the upstream source. As above, for technical reasons, B<it "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:238
+#: ../dgit-maint-debrebase.7.pod:203
+msgid ""
+"A convenient way to ensure this requirement is satisfied is to start by "
+"creating I<debian/gbp.conf>:"
+msgstr ""
+
+#. type: verbatim
+#: ../dgit-maint-debrebase.7.pod:217
+#, no-wrap
+msgid ""
+" [import-orig]\n"
+" merge = False\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-debrebase.7.pod:222
+msgid "and commit that:"
+msgstr ""
+
+#. type: verbatim
+#: ../dgit-maint-debrebase.7.pod:226
+#, no-wrap
+msgid ""
+" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-debrebase.7.pod:230
+msgid ""
+"Note that we couldn't create I<debian/gbp.conf> before now for the same "
+"technical reasons which require our first commit to introduce I<debian/> "
+"without patching the upstream source. That's why we had to pass a lot of "
+"options to our first call to gbp-import-orig(1)."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-debrebase.7.pod:240
msgid ""
"If you have an existing git history that you have pushed to an ordinary git "
"server like B<salsa.debian.org>, we start with that. If you don't already "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:245
+#: ../dgit-maint-debrebase.7.pod:247
#, no-wrap
msgid ""
" % git clone salsa.debian.org:Debian/foo\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:252
+#: ../dgit-maint-debrebase.7.pod:254
msgid ""
"If you don't have any existing git history, or you have history only on the "
"special B<dgit-repos> server, we start with B<dgit clone>:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:257
+#: ../dgit-maint-debrebase.7.pod:259
#, no-wrap
msgid ""
" % dgit clone foo\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:262
+#: ../dgit-maint-debrebase.7.pod:264
msgid "Then we make new upstream tags available:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:270
+#: ../dgit-maint-debrebase.7.pod:272
msgid ""
"We now use a B<git debrebase convert-from-*> command to convert your "
"existing history to the git-debrebase(5) data model. Which command you "
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:276
+#: ../dgit-maint-debrebase.7.pod:278
msgid "(A) There is no delta queue."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:278
+#: ../dgit-maint-debrebase.7.pod:280
msgid "If there do not exist any Debian patches, use"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:282 ../dgit-maint-debrebase.7.pod:294
+#: ../dgit-maint-debrebase.7.pod:284 ../dgit-maint-debrebase.7.pod:296
#, no-wrap
msgid ""
" % git debrebase convert-from-gbp\n"
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:286
+#: ../dgit-maint-debrebase.7.pod:288
msgid "(B) There is a delta queue, and patches are unapplied."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:288
+#: ../dgit-maint-debrebase.7.pod:290
msgid ""
"This is the standard git-buildpackage(1) workflow: there are Debian patches, "
"but the upstream source is committed to git without those patches applied. "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:298
+#: ../dgit-maint-debrebase.7.pod:300
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 "
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:303
+#: ../dgit-maint-debrebase.7.pod:305
msgid "(C) There is a delta queue, and patches are applied."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:305
+#: ../dgit-maint-debrebase.7.pod:307
msgid "Use"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:309
+#: ../dgit-maint-debrebase.7.pod:311
#, no-wrap
msgid ""
" % git debrebase convert-from-dgit-view\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:315
+#: ../dgit-maint-debrebase.7.pod:317
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-"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:326
+#: ../dgit-maint-debrebase.7.pod:328
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 "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:333
+#: ../dgit-maint-debrebase.7.pod:335
#, no-wrap
msgid ""
" % git config --local pull.rebase true\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:337
+#: ../dgit-maint-debrebase.7.pod:339
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:340
+#: ../dgit-maint-debrebase.7.pod:342
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 "
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:345
+#: ../dgit-maint-debrebase.7.pod:347
msgid "IMPORTING NEW UPSTREAM RELEASES"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:347
+#: ../dgit-maint-debrebase.7.pod:349
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:387
+#: ../dgit-maint-debrebase.7.pod:389
msgid "Importing the release"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:391
+#: ../dgit-maint-debrebase.7.pod:393
#, no-wrap
msgid ""
" % git debrebase new-upstream 1.2.3\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:395
+#: ../dgit-maint-debrebase.7.pod:397
+msgid "replacing I<1.2.3> with I<upstream/1.2.3> if you imported a tarball."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-debrebase.7.pod:399
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:399
+#: ../dgit-maint-debrebase.7.pod:403
msgid ""
"If all went well, you can now review the merge of the new upstream release:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:404
+#: ../dgit-maint-debrebase.7.pod:408
#, no-wrap
msgid ""
" git diff debian/1.2.2-1..HEAD -- . ':!debian'\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:408
+#: ../dgit-maint-debrebase.7.pod:412
msgid ""
"Also, diff with I<--name-status> and I<--diff-filter=ADR> to see just the "
"list of added or removed files, which is useful to determine whether there "
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:423
+#: ../dgit-maint-debrebase.7.pod:427
msgid "EDITING THE DEBIAN PACKAGING"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:425
+#: ../dgit-maint-debrebase.7.pod:429
msgid "Just make commits on master that change the contents of I<debian/>."
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:427
+#: ../dgit-maint-debrebase.7.pod:431
msgid "EDITING THE DELTA QUEUE"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:429
+#: ../dgit-maint-debrebase.7.pod:433
msgid "Adding new patches"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:431
+#: ../dgit-maint-debrebase.7.pod:435
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-"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:435
+#: ../dgit-maint-debrebase.7.pod:439
msgid "Editing patches: starting a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:437
+#: ../dgit-maint-debrebase.7.pod:441
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:442 ../dgit-maint-debrebase.7.pod:745
+#: ../dgit-maint-debrebase.7.pod:446 ../dgit-maint-debrebase.7.pod:749
#, no-wrap
msgid ""
" % git debrebase -i\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:446
+#: ../dgit-maint-debrebase.7.pod:450
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:449
+#: ../dgit-maint-debrebase.7.pod:453
msgid "Editing patches: finishing a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:451
+#: ../dgit-maint-debrebase.7.pod:455
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:457
+#: ../dgit-maint-debrebase.7.pod:461
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:462
+#: ../dgit-maint-debrebase.7.pod:466
#, no-wrap
msgid ""
" % git debrebase conclude\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:466
+#: ../dgit-maint-debrebase.7.pod:470
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:474
+#: ../dgit-maint-debrebase.7.pod:478
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:478
+#: ../dgit-maint-debrebase.7.pod:482
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:481
+#: ../dgit-maint-debrebase.7.pod:485
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-"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:487
+#: ../dgit-maint-debrebase.7.pod:491
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 "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:493
+#: ../dgit-maint-debrebase.7.pod:497
#, no-wrap
msgid ""
" % git debrebase\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:498
+#: ../dgit-maint-debrebase.7.pod:502
msgid "Note that this will introduce a new pseudomerge."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:500
+#: ../dgit-maint-debrebase.7.pod:504
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:505
+#: ../dgit-maint-debrebase.7.pod:509
msgid "Illegal material"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:507
+#: ../dgit-maint-debrebase.7.pod:511
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 "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:511
+#: ../dgit-maint-debrebase.7.pod:515
#, no-wrap
msgid ""
"If you encounter possibly-legally-dangerous material in the upstream\n"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:517
+#: ../dgit-maint-debrebase.7.pod:521
msgid "DFSG-non-free: When upstream tags releases in git"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:519
+#: ../dgit-maint-debrebase.7.pod:523
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:525
+#: ../dgit-maint-debrebase.7.pod:529
msgid "For the first upstream release that requires DFSG filtering:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:529
+#: ../dgit-maint-debrebase.7.pod:533
#, no-wrap
msgid ""
" % git checkout -b upstream-dfsg 1.2.3\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:537
+#: ../dgit-maint-debrebase.7.pod:541
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:542
+#: ../dgit-maint-debrebase.7.pod:546
#, no-wrap
msgid ""
" % git branch --unset-upstream\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:547
+#: ../dgit-maint-debrebase.7.pod:551
msgid "and proceed with \"INITIAL DEBIANISATION\"."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:549
+#: ../dgit-maint-debrebase.7.pod:553
msgid ""
"For subsequent releases (whether or not they require additional filtering):"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:554
+#: ../dgit-maint-debrebase.7.pod:558
#, no-wrap
msgid ""
" % git checkout upstream-dfsg\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:564
+#: ../dgit-maint-debrebase.7.pod:568
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 "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:571
+#: ../dgit-maint-debrebase.7.pod:575
#, no-wrap
msgid ""
" % git push --follow-tags -u origin master upstream-dfsg\n"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:575
+#: ../dgit-maint-debrebase.7.pod:579
msgid "DFSG-non-free: When upstream releases only tarballs"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:584
+#: ../dgit-maint-debrebase.7.pod:588
msgid "In the simplest case,"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:588
+#: ../dgit-maint-debrebase.7.pod:592
#, no-wrap
msgid ""
" % dgit fetch\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:593
+#: ../dgit-maint-debrebase.7.pod:597
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:597
+#: ../dgit-maint-debrebase.7.pod:601
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 "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:601
+#: ../dgit-maint-debrebase.7.pod:605
msgid "Rebasing your work onto the NMU"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:605
+#: ../dgit-maint-debrebase.7.pod:609
#, no-wrap
msgid ""
" % git rebase dgit/dgit/sid\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:609
+#: ../dgit-maint-debrebase.7.pod:613
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:612
+#: ../dgit-maint-debrebase.7.pod:616
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 "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:616
+#: ../dgit-maint-debrebase.7.pod:620
msgid "Manually applying the debdiff"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:618
+#: ../dgit-maint-debrebase.7.pod:622
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 "
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:623
+#: ../dgit-maint-debrebase.7.pod:627
msgid "HINTS AND TIPS"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:625
+#: ../dgit-maint-debrebase.7.pod:629
msgid "Minimising pseudomerges"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:627
+#: ../dgit-maint-debrebase.7.pod:631
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:630
+#: ../dgit-maint-debrebase.7.pod:634
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."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:634
+#: ../dgit-maint-debrebase.7.pod:638
msgid ""
"It is possible, though much less convenient, to reduce the number of "
"pseudomerges yet further. We debrebase only (i) when importing a new "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:642
+#: ../dgit-maint-debrebase.7.pod:646
msgid "The debian/patches directory"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:644
+#: ../dgit-maint-debrebase.7.pod:648
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:649
+#: ../dgit-maint-debrebase.7.pod:653
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 "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:655
+#: ../dgit-maint-debrebase.7.pod:659
msgid "Upstream branches"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:657
+#: ../dgit-maint-debrebase.7.pod:661
msgid "In this workflow, we specify upstream tags rather than any branches."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:659
+#: ../dgit-maint-debrebase.7.pod:663
msgid ""
"Except when (i) upstream releases only tarballs, (ii) we require DFSG "
"filtering, or (iii) you also happen to be involved in upstream development, "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:665
+#: ../dgit-maint-debrebase.7.pod:669
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:671
+#: ../dgit-maint-debrebase.7.pod:675
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:674
+#: ../dgit-maint-debrebase.7.pod:678
msgid "The first ever dgit push"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:676
+#: ../dgit-maint-debrebase.7.pod:680
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 "
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:682
+#: ../dgit-maint-debrebase.7.pod:686
msgid "Inspecting the history"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:684
+#: ../dgit-maint-debrebase.7.pod:688
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:688
+#: ../dgit-maint-debrebase.7.pod:692
msgid "History of package in Debian, disregarding history from upstream:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:692
+#: ../dgit-maint-debrebase.7.pod:696
#, no-wrap
msgid ""
" % gitk --first-parent\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:694
+#: ../dgit-maint-debrebase.7.pod:698
msgid "In a laundered branch, the delta queue is at the top."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:698
+#: ../dgit-maint-debrebase.7.pod:702
msgid "History of the packaging, excluding the delta queue:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:700
+#: ../dgit-maint-debrebase.7.pod:704
#, no-wrap
msgid ""
" % gitk :/debian :!/debian/patches\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:702
+#: ../dgit-maint-debrebase.7.pod:706
msgid "Just the delta queue (i.e. Debian's changes to upstream):"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:704
+#: ../dgit-maint-debrebase.7.pod:708
#, no-wrap
msgid ""
" % gitk --first-parent -- :/ :!/debian\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:706
+#: ../dgit-maint-debrebase.7.pod:710
msgid "Full history including old versions of the delta queue:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:710
+#: ../dgit-maint-debrebase.7.pod:714
#, no-wrap
msgid ""
" % gitk --date-order\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:712
+#: ../dgit-maint-debrebase.7.pod:716
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. --"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:719
+#: ../dgit-maint-debrebase.7.pod:723
msgid "Complete diff since the last upload:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:723
+#: ../dgit-maint-debrebase.7.pod:727
#, no-wrap
msgid ""
" % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:725
+#: ../dgit-maint-debrebase.7.pod:729
msgid "This includes changes to upstream files."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:729
+#: ../dgit-maint-debrebase.7.pod:733
msgid "Interdiff of delta queue since last upload, if you really want it:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:731
+#: ../dgit-maint-debrebase.7.pod:735
#, no-wrap
msgid ""
" % git debrebase make-patches\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:734
+#: ../dgit-maint-debrebase.7.pod:738
msgid "And of course there is:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:736
+#: ../dgit-maint-debrebase.7.pod:740
#, no-wrap
msgid ""
" % git debrebase status\n"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:738
+#: ../dgit-maint-debrebase.7.pod:742
msgid "Alternative ways to start a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:740
+#: ../dgit-maint-debrebase.7.pod:744
msgid ""
"Above we started an interactive debrebase by invoking git-debrebase(1) like "
"this:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:749
+#: ../dgit-maint-debrebase.7.pod:753
msgid "It is also possible to perform a non-interactive rebase, like this:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:753
+#: ../dgit-maint-debrebase.7.pod:757
#, no-wrap
msgid ""
" % git debrebase -- [git-rebase options...]\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:758
+#: ../dgit-maint-debrebase.7.pod:762
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 "
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:764
+#: ../dgit-maint-debrebase.7.pod:768
#, no-wrap
msgid ""
" % git debrebase\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:769
+#: ../dgit-maint-debrebase.7.pod:773
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 "
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:780
+#: ../dgit-maint-debrebase.7.pod:784
msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)"
msgstr ""
~ianmdlvl / dgit.git / blobdiff