1 # English translations for po package
2 # Copyright (C) 2018 Free Software Foundation, Inc.
3 # This file is distributed under the same license as the po package.
4 # Automatically generated, 2018.
8 "Project-Id-Version: po 4a\n"
9 "POT-Creation-Date: 2018-10-04 01:04+0100\n"
10 "PO-Revision-Date: 2018-10-04 01:04+0100\n"
11 "Last-Translator: Automatically generated\n"
12 "Language-Team: none\n"
15 "Content-Type: text/plain; charset=UTF-8\n"
16 "Content-Transfer-Encoding: 8bit\n"
17 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
20 #: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1
21 #: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
22 #: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
23 #: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
24 #: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
30 #: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
31 #: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
32 #: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
33 #: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
34 #: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
35 #: ../git-debrebase.5.pod:678
41 #: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5
42 #: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5
43 #: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5
44 #: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
49 #: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7
51 "git-debrebase is a tool for representing in git, and manpulating, Debian "
52 "packages based on upstream source code."
54 "git-debrebase is a tool for representing in git, and manpulating, Debian "
55 "packages based on upstream source code."
58 #: ../git-debrebase.5.pod:3
59 msgid "git-debrebase - git data model for Debian packaging"
60 msgstr "git-debrebase - git data model for Debian packaging"
63 #: ../git-debrebase.5.pod:11
65 "The Debian packaging has a fast forwarding history. The delta queue "
66 "(changes to upstream files) is represented as a series of individual git "
67 "commits, which can worked on with rebase, and also shared."
69 "The Debian packaging has a fast forwarding history. The delta queue "
70 "(changes to upstream files) is represented as a series of individual git "
71 "commits, which can worked on with rebase, and also shared."
74 #: ../git-debrebase.5.pod:18
79 #: ../git-debrebase.5.pod:20
81 "git-debrebase is designed to work well with dgit. git-debrebase can also be "
82 "used in workflows without source packages, for example to work on Debian-"
83 "format packages outside or alongside Debian."
85 "git-debrebase is designed to work well with dgit. git-debrebase can also be "
86 "used in workflows without source packages, for example to work on Debian-"
87 "format packages outside or alongside Debian."
90 #: ../git-debrebase.5.pod:24
92 "git-debrebase itself is not very suitable for use by Debian derivatives, to "
93 "work on packages inherited from Debian, because it assumes that you want to "
94 "throw away any packaging provided by your upstream. However, use of git-"
95 "debrebase in Debian does not make anything harder for derivatives, and it "
96 "can make some things easier."
98 "git-debrebase itself is not very suitable for use by Debian derivatives, to "
99 "work on packages inherited from Debian, because it assumes that you want to "
100 "throw away any packaging provided by your upstream. However, use of git-"
101 "debrebase in Debian does not make anything harder for derivatives, and it "
102 "can make some things easier."
105 #: ../git-debrebase.5.pod:32
107 "When using gitk on branches managed by git-debrebase, B<gitk --date-order>, "
108 "B<gitk --first-parent> and B<gitk -- :.> (or B<gitk .>) produce more useful "
109 "output than the default."
111 "When using gitk on branches managed by git-debrebase, B<gitk --date-order>, "
112 "B<gitk --first-parent> and B<gitk -- :.> (or B<gitk .>) produce more useful "
113 "output than the default."
116 #: ../git-debrebase.5.pod:37
121 #: ../git-debrebase.5.pod:41
126 #: ../git-debrebase.5.pod:43
128 "A merge which does not actually merge the trees; instead, it is constructed "
129 "by taking the tree from one of the parents (ignoring the contents of the "
130 "other parents). These are used to make a rewritten history fast forward "
131 "from a previous tip, so that it can be pushed and pulled normally. Manual "
132 "construction of pseudomerges can be done with C<git merge -s ours> but is "
133 "not normally needed when using git-debrebase."
135 "A merge which does not actually merge the trees; instead, it is constructed "
136 "by taking the tree from one of the parents (ignoring the contents of the "
137 "other parents). These are used to make a rewritten history fast forward "
138 "from a previous tip, so that it can be pushed and pulled normally. Manual "
139 "construction of pseudomerges can be done with C<git merge -s ours> but is "
140 "not normally needed when using git-debrebase."
143 #: ../git-debrebase.5.pod:54
144 msgid "Packaging files"
145 msgstr "Packaging files"
148 #: ../git-debrebase.5.pod:56
150 "Files in the source tree within B<debian/>, excluding anything in B<debian/"
153 "Files in the source tree within B<debian/>, excluding anything in B<debian/"
157 #: ../git-debrebase.5.pod:59
162 #: ../git-debrebase.5.pod:61
164 "The version of the package without Debian's packaging. Typically provided "
165 "by the actual upstream project, and sometimes tracked by Debian contributors "
166 "in a branch C<upstream>."
168 "The version of the package without Debian's packaging. Typically provided "
169 "by the actual upstream project, and sometimes tracked by Debian contributors "
170 "in a branch C<upstream>."
173 #: ../git-debrebase.5.pod:65
175 "Upstream contains upstream files, but some upstreams also contain packaging "
176 "files in B<debian/>. Any such non-upstream files found in upstream are "
177 "thrown away by git-debrebase each time a new upstream version is "
180 "Upstream contains upstream files, but some upstreams also contain packaging "
181 "files in B<debian/>. Any such non-upstream files found in upstream are "
182 "thrown away by git-debrebase each time a new upstream version is "
186 #: ../git-debrebase.5.pod:71
187 msgid "Upstream files"
188 msgstr "Upstream files"
191 #: ../git-debrebase.5.pod:73
193 "Files in the source tree outside B<debian/>. These may include unmodified "
194 "source from upstream, but also files which have been modified or created for "
197 "Files in the source tree outside B<debian/>. These may include unmodified "
198 "source from upstream, but also files which have been modified or created for "
202 #: ../git-debrebase.5.pod:77
207 #: ../git-debrebase.5.pod:79
208 msgid "Debian's changes to upstream files: a series of git commits."
209 msgstr "Debian's changes to upstream files: a series of git commits."
212 #: ../git-debrebase.5.pod:82
213 msgid "Quilt patches"
214 msgstr "Quilt patches"
217 #: ../git-debrebase.5.pod:84
219 "Files in B<debian/patches/> generated for the benefit of dpkg-source's 3.0 "
220 "(quilt) .dsc source package format. Not used, often deleted, and "
221 "regenerated when needed (such as when uploading to Debian), by git-debrebase."
223 "Files in B<debian/patches/> generated for the benefit of dpkg-source's 3.0 "
224 "(quilt) .dsc source package format. Not used, often deleted, and "
225 "regenerated when needed (such as when uploading to Debian), by git-debrebase."
228 #: ../git-debrebase.5.pod:90
229 msgid "Interchange branch; breakwater; stitched; laundered"
230 msgstr "Interchange branch; breakwater; stitched; laundered"
233 #: ../git-debrebase.5.pod:92
234 msgid "See L</BRANCHES AND BRANCH STATES - OVERVIEW>."
235 msgstr "See L</BRANCHES AND BRANCH STATES - OVERVIEW>."
238 #: ../git-debrebase.5.pod:94
239 msgid "Anchor; Packaging"
240 msgstr "Anchor; Packaging"
243 #: ../git-debrebase.5.pod:96
244 msgid "See L</BRANCH CONTENTS - DETAILED SPECIFICATION>."
245 msgstr "See L</BRANCH CONTENTS - DETAILED SPECIFICATION>."
248 #: ../git-debrebase.5.pod:98
249 msgid "ffq-prev; debrebase-last"
250 msgstr "ffq-prev; debrebase-last"
253 #: ../git-debrebase.5.pod:100
254 msgid "See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>."
255 msgstr "See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>."
258 #: ../git-debrebase.5.pod:104
263 #: ../git-debrebase.5.pod:106
266 " ------/--A!----/--B3!--%--/--> interchange view\n"
267 " / / / with debian/ directory\n"
268 " % % % entire delta queue applied\n"
269 " / / / 3.0 (quilt) has debian/patches\n"
270 " / / 3* \"master\" on Debian git servers\n"
274 " 1 1 1 breakwater branch, merging baseline\n"
275 " / / / unmodified upstream code\n"
276 " ---@-----@--A----@--B--C plus debian/ (but no debian/patches)\n"
277 " / / / no ref refers to this: we\n"
278 " --#-----#-------#-----> upstream reconstruct its identity by\n"
279 " inspecting interchange branch\n"
283 " ------/--A!----/--B3!--%--/--> interchange view\n"
284 " / / / with debian/ directory\n"
285 " % % % entire delta queue applied\n"
286 " / / / 3.0 (quilt) has debian/patches\n"
287 " / / 3* \"master\" on Debian git servers\n"
291 " 1 1 1 breakwater branch, merging baseline\n"
292 " / / / unmodified upstream code\n"
293 " ---@-----@--A----@--B--C plus debian/ (but no debian/patches)\n"
294 " / / / no ref refers to this: we\n"
295 " --#-----#-------#-----> upstream reconstruct its identity by\n"
296 " inspecting interchange branch\n"
301 #: ../git-debrebase.5.pod:122
304 " 1,2,3 commits touching upstream files only\n"
305 " A,B,C commits touching debian/ only\n"
306 " B3 mixed commit (eg made by an NMUer)\n"
307 " # upstream releases\n"
310 " 1,2,3 commits touching upstream files only\n"
311 " A,B,C commits touching debian/ only\n"
312 " B3 mixed commit (eg made by an NMUer)\n"
313 " # upstream releases\n"
317 #: ../git-debrebase.5.pod:127
320 " -@- anchor merge, takes contents of debian/ from the\n"
321 " / previous `breakwater' commit and rest from upstream\n"
324 " -@- anchor merge, takes contents of debian/ from the\n"
325 " / previous `breakwater' commit and rest from upstream\n"
329 #: ../git-debrebase.5.pod:130
332 " -/- pseudomerge; contents are identical to\n"
333 " / parent lower on diagram.\n"
336 " -/- pseudomerge; contents are identical to\n"
337 " / parent lower on diagram.\n"
341 #: ../git-debrebase.5.pod:133
344 " % dgit- or git-debrebase- generated commit of debian/patches.\n"
345 " `3.0 (quilt)' only; generally dropped by git-debrebase.\n"
348 " % dgit- or git-debrebase- generated commit of debian/patches.\n"
349 " `3.0 (quilt)' only; generally dropped by git-debrebase.\n"
353 #: ../git-debrebase.5.pod:136
356 " * Maintainer's HEAD was here while they were editing,\n"
357 " before they said they were done, at which point their\n"
358 " tools made -/- (and maybe %) to convert to\n"
359 " the fast-forwarding interchange branch.\n"
362 " * Maintainer's HEAD was here while they were editing,\n"
363 " before they said they were done, at which point their\n"
364 " tools made -/- (and maybe %) to convert to\n"
365 " the fast-forwarding interchange branch.\n"
369 #: ../git-debrebase.5.pod:141
372 " ! NMUer's HEAD was here when they said `dgit push'.\n"
373 " Rebase branch launderer turns each ! into an\n"
377 " ! NMUer's HEAD was here when they said `dgit push'.\n"
378 " Rebase branch launderer turns each ! into an\n"
383 #: ../git-debrebase.5.pod:145
384 msgid "BRANCHES AND BRANCH STATES - OVERVIEW"
385 msgstr "BRANCHES AND BRANCH STATES - OVERVIEW"
388 #: ../git-debrebase.5.pod:147
390 "git-debrebase has one primary branch, the B<interchange branch>. This "
391 "branch is found on Debian contributor's workstations (typically, a "
392 "maintainer would call it B<master>), in the Debian dgit git server as the "
393 "suite branch (B<dgit/dgit/sid>) and on other git servers which support "
394 "Debian work (eg B<master> on salsa)."
396 "git-debrebase has one primary branch, the B<interchange branch>. This "
397 "branch is found on Debian contributor's workstations (typically, a "
398 "maintainer would call it B<master>), in the Debian dgit git server as the "
399 "suite branch (B<dgit/dgit/sid>) and on other git servers which support "
400 "Debian work (eg B<master> on salsa)."
403 #: ../git-debrebase.5.pod:155
405 "The interchange branch is fast-forwarding (by virtue of pseudomerges, where "
408 "The interchange branch is fast-forwarding (by virtue of pseudomerges, where "
412 #: ../git-debrebase.5.pod:158
414 "It is possible to have multiple different interchange branches for the same "
415 "package, stored as different local and remote git branches. However, "
416 "divergence should be avoided where possible - see L</OTHER MERGES>."
418 "It is possible to have multiple different interchange branches for the same "
419 "package, stored as different local and remote git branches. However, "
420 "divergence should be avoided where possible - see L</OTHER MERGES>."
423 #: ../git-debrebase.5.pod:164
425 "A suitable interchange branch can be used directly with dgit. In this case "
426 "each dgit archive suite branch is a separate interchange branch."
428 "A suitable interchange branch can be used directly with dgit. In this case "
429 "each dgit archive suite branch is a separate interchange branch."
432 #: ../git-debrebase.5.pod:168
434 "Within the ancestry of the interchange branch, there is another important, "
435 "implicit branch, the B<breakwater>. The breakwater contains unmodified "
436 "upstream source, but with Debian's packaging superimposed (replacing any "
437 "C<debian/> directory that may be in the upstream commits). The breakwater "
438 "does not contain any representation of the delta queue (not even debian/"
439 "patches). The part of the breakwater processed by git-debrebase is the part "
440 "since the most reecent B<anchor>, which is usually a special merge generated "
443 "Within the ancestry of the interchange branch, there is another important, "
444 "implicit branch, the B<breakwater>. The breakwater contains unmodified "
445 "upstream source, but with Debian's packaging superimposed (replacing any "
446 "C<debian/> directory that may be in the upstream commits). The breakwater "
447 "does not contain any representation of the delta queue (not even debian/"
448 "patches). The part of the breakwater processed by git-debrebase is the part "
449 "since the most reecent B<anchor>, which is usually a special merge generated "
453 #: ../git-debrebase.5.pod:181
455 "When working, locally, the user's branch can be in a rebasing state, known "
456 "as B<unstitched>. While a branch is unstitched, it is not in interchange "
457 "format. The previous interchange branch tip is recorded, so that the "
458 "previous history and the user's work can later be stitched into the fast-"
459 "forwarding interchange form."
461 "When working, locally, the user's branch can be in a rebasing state, known "
462 "as B<unstitched>. While a branch is unstitched, it is not in interchange "
463 "format. The previous interchange branch tip is recorded, so that the "
464 "previous history and the user's work can later be stitched into the fast-"
465 "forwarding interchange form."
468 #: ../git-debrebase.5.pod:193
470 "An unstitched branch may be in B<laundered> state, which means it has a more "
471 "particular special form convenient for manipulating the delta queue."
473 "An unstitched branch may be in B<laundered> state, which means it has a more "
474 "particular special form convenient for manipulating the delta queue."
477 #: ../git-debrebase.5.pod:199
478 msgid "BRANCH CONTENTS - DETAILED SPECIFICATION"
479 msgstr "BRANCH CONTENTS - DETAILED SPECIFICATION"
482 #: ../git-debrebase.5.pod:201
484 "It is most convenient to describe the B<breakwater> branch first. A "
485 "breakwater is B<fast-forwarding>, but is not usually named by a ref. It "
486 "contains B<in this order> (ancestors first):"
488 "It is most convenient to describe the B<breakwater> branch first. A "
489 "breakwater is B<fast-forwarding>, but is not usually named by a ref. It "
490 "contains B<in this order> (ancestors first):"
493 #: ../git-debrebase.5.pod:210
498 #: ../git-debrebase.5.pod:212
499 msgid "An B<anchor> commit, which is usually a special two-parent merge:"
500 msgstr "An B<anchor> commit, which is usually a special two-parent merge:"
503 #: ../git-debrebase.5.pod:215
505 "The first parent contains the most recent version, at that point, of the "
506 "Debian packaging (in debian/); it also often contains upstream files, but "
507 "they are to be ignored. Often the first parent is a previous breakwater tip."
509 "The first parent contains the most recent version, at that point, of the "
510 "Debian packaging (in debian/); it also often contains upstream files, but "
511 "they are to be ignored. Often the first parent is a previous breakwater tip."
514 #: ../git-debrebase.5.pod:222
516 "The second parent is an upstream source commit. It may sometimes contain a "
517 "debian/ subdirectory, but if so that is to be ignored. The second parent's "
518 "upstream files are identical to the anchor's. Anchor merges always contain "
519 "C<[git-debrebase anchor: ...]> as a line in the commit message."
521 "The second parent is an upstream source commit. It may sometimes contain a "
522 "debian/ subdirectory, but if so that is to be ignored. The second parent's "
523 "upstream files are identical to the anchor's. Anchor merges always contain "
524 "C<[git-debrebase anchor: ...]> as a line in the commit message."
527 #: ../git-debrebase.5.pod:232
529 "Alternatively, an anchor may be a single-parent commit which introduces the "
530 "C<debian/> directory and makes no other changes: ie, the start of Debian "
533 "Alternatively, an anchor may be a single-parent commit which introduces the "
534 "C<debian/> directory and makes no other changes: ie, the start of Debian "
538 #: ../git-debrebase.5.pod:237
543 #: ../git-debrebase.5.pod:239
545 "Zero or more single-parent commits containing only packaging changes. (And "
546 "no quilt patch changes.)"
548 "Zero or more single-parent commits containing only packaging changes. (And "
549 "no quilt patch changes.)"
552 #: ../git-debrebase.5.pod:245
554 "The B<laundered> branch state is B<rebasing>. A laundered branch is based "
555 "on a breakwater but also contains, additionally, B<after> the breakwater, a "
556 "representation of the delta queue:"
558 "The B<laundered> branch state is B<rebasing>. A laundered branch is based "
559 "on a breakwater but also contains, additionally, B<after> the breakwater, a "
560 "representation of the delta queue:"
563 #: ../git-debrebase.5.pod:255
564 msgid "Delta queue commits"
565 msgstr "Delta queue commits"
568 #: ../git-debrebase.5.pod:257
570 "Zero or more single-parent commits contaioning only changes to upstream "
573 "Zero or more single-parent commits contaioning only changes to upstream "
577 #: ../git-debrebase.5.pod:262
579 "The merely B<unstitched> (ie, unstitched but unlaundered) branch state is "
580 "also B<rebasing>. It has the same contents as the laundered state, except "
581 "that it may contain, additionally, in B<in any order but after the "
584 "The merely B<unstitched> (ie, unstitched but unlaundered) branch state is "
585 "also B<rebasing>. It has the same contents as the laundered state, except "
586 "that it may contain, additionally, in B<in any order but after the "
590 #: ../git-debrebase.5.pod:273
591 msgid "Linear commits to the source"
592 msgstr "Linear commits to the source"
595 #: ../git-debrebase.5.pod:275
597 "Further commit(s) containing changes to to upstream files and/or to "
598 "packaging, possibly mixed within a single commit. (But not quilt patch "
601 "Further commit(s) containing changes to to upstream files and/or to "
602 "packaging, possibly mixed within a single commit. (But not quilt patch "
606 #: ../git-debrebase.5.pod:282
607 msgid "Quilt patch addition for `3.0 (quilt)'"
608 msgstr "Quilt patch addition for `3.0 (quilt)'"
611 #: ../git-debrebase.5.pod:284
613 "Commit(s) which add patches to B<debian/patches/>, and add those patches to "
614 "the end of B<series>."
616 "Commit(s) which add patches to B<debian/patches/>, and add those patches to "
617 "the end of B<series>."
620 #: ../git-debrebase.5.pod:287
622 "These are only necessary when working with packages in C<.dsc 3.0 (quilt)> "
623 "format. For git-debrebase they are purely an output; they are deleted when "
624 "branches are laundered. git-debrebase takes care to make a proper patch "
625 "series out of the delta queue, so that any resulting source packages are "
628 "These are only necessary when working with packages in C<.dsc 3.0 (quilt)> "
629 "format. For git-debrebase they are purely an output; they are deleted when "
630 "branches are laundered. git-debrebase takes care to make a proper patch "
631 "series out of the delta queue, so that any resulting source packages are "
635 #: ../git-debrebase.5.pod:297
637 "Finally, an B<interchange> branch is B<fast forwarding>. It has the same "
638 "contents as an unlaundered branch state, but may (and usually will) "
639 "additionally contain (in some order, possibly intermixed with the extra "
640 "commits which may be found on an unstitched unlaundered branch):"
642 "Finally, an B<interchange> branch is B<fast forwarding>. It has the same "
643 "contents as an unlaundered branch state, but may (and usually will) "
644 "additionally contain (in some order, possibly intermixed with the extra "
645 "commits which may be found on an unstitched unlaundered branch):"
648 #: ../git-debrebase.5.pod:309
649 msgid "Pseudomerge to make fast forward"
650 msgstr "Pseudomerge to make fast forward"
653 #: ../git-debrebase.5.pod:311
655 "A pseudomerge making the branch fast forward from previous history. The "
656 "contributing parent is itself in interchange format. Normally the "
657 "overwritten parent is a previous tip of an interchange branch, but this is "
658 "not necessary as the overwritten parent is not examined."
660 "A pseudomerge making the branch fast forward from previous history. The "
661 "contributing parent is itself in interchange format. Normally the "
662 "overwritten parent is a previous tip of an interchange branch, but this is "
663 "not necessary as the overwritten parent is not examined."
666 #: ../git-debrebase.5.pod:319
668 "If the two parents have identical trees, the one with the later commit date "
669 "(or, if the commit dates are the same, the first parent) is treated as the "
670 "contributing parent."
672 "If the two parents have identical trees, the one with the later commit date "
673 "(or, if the commit dates are the same, the first parent) is treated as the "
674 "contributing parent."
677 #: ../git-debrebase.5.pod:326
678 msgid "dgit dsc import pseudomerge"
679 msgstr "dgit dsc import pseudomerge"
682 #: ../git-debrebase.5.pod:328
684 "Debian .dsc source package import(s) made by dgit (during dgit fetch of a "
685 "package most recently uploaded to Debian without dgit, or during dgit import-"
688 "Debian .dsc source package import(s) made by dgit (during dgit fetch of a "
689 "package most recently uploaded to Debian without dgit, or during dgit import-"
693 #: ../git-debrebase.5.pod:334
695 "git-debrebase requires that each such import is in the fast-forwarding "
696 "format produced by dgit: a two-parent pseudomerge, whose contributing parent "
697 "is in the non-fast-forwarding dgit dsc import format (not described further "
698 "here), and whose overwritten parent is the previous interchange tip (eg, the "
699 "previous tip of the dgit suite branch)."
701 "git-debrebase requires that each such import is in the fast-forwarding "
702 "format produced by dgit: a two-parent pseudomerge, whose contributing parent "
703 "is in the non-fast-forwarding dgit dsc import format (not described further "
704 "here), and whose overwritten parent is the previous interchange tip (eg, the "
705 "previous tip of the dgit suite branch)."
708 #: ../git-debrebase.5.pod:347
709 msgid "STITCHING, PSEUDO-MERGES, FFQ RECORD"
710 msgstr "STITCHING, PSEUDO-MERGES, FFQ RECORD"
713 #: ../git-debrebase.5.pod:349
715 "Whenever the branch C<refs/B> is unstitched, the previous head is recorded "
716 "in the git ref C<refs/ffq-prev/B>."
718 "Whenever the branch C<refs/B> is unstitched, the previous head is recorded "
719 "in the git ref C<refs/ffq-prev/B>."
722 #: ../git-debrebase.5.pod:352
724 "Unstiched branches are not fast forward from the published interchange "
725 "branches [1]. So before a branch can be pushed, the right pseudomerge must "
726 "be reestablished. This is the stitch operation, which consumes the ffq-prev "
729 "Unstiched branches are not fast forward from the published interchange "
730 "branches [1]. So before a branch can be pushed, the right pseudomerge must "
731 "be reestablished. This is the stitch operation, which consumes the ffq-prev "
735 #: ../git-debrebase.5.pod:359
737 "When the user has an unstitched branch, they may rewrite it freely, from the "
738 "breakwater tip onwards. Such a git rebase is the default operation for git-"
739 "debrebase. Rebases should not go back before the breakwater tip, and "
740 "certainly not before the most recent anchor."
742 "When the user has an unstitched branch, they may rewrite it freely, from the "
743 "breakwater tip onwards. Such a git rebase is the default operation for git-"
744 "debrebase. Rebases should not go back before the breakwater tip, and "
745 "certainly not before the most recent anchor."
748 #: ../git-debrebase.5.pod:366
750 "Unstitched branches must not be pushed to interchange branch refs (by the "
751 "use of C<git push -f> or equivalent). It is OK to share an unstitched "
752 "branch in similar circumstances and with similar warnings to sharing any "
753 "other rebasing git branch."
755 "Unstitched branches must not be pushed to interchange branch refs (by the "
756 "use of C<git push -f> or equivalent). It is OK to share an unstitched "
757 "branch in similar circumstances and with similar warnings to sharing any "
758 "other rebasing git branch."
761 #: ../git-debrebase.5.pod:372
763 "[1] Strictly, for a package which has never had a Debian delta queue, the "
764 "interchange and breakwater branches may be identical, in which case the "
765 "unstitched branch is fast forward from the interchange branch and no "
766 "pseudomerge is needed."
768 "[1] Strictly, for a package which has never had a Debian delta queue, the "
769 "interchange and breakwater branches may be identical, in which case the "
770 "unstitched branch is fast forward from the interchange branch and no "
771 "pseudomerge is needed."
774 #: ../git-debrebase.5.pod:378
776 "When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor "
777 "of refs/B, (usually, the result of last stitch). This is used for status "
778 "printing and some error error checks - especially for printing guesses what "
779 "a problem is. To determine whether a branch is is being maintained in git-"
780 "debrebase form it is necessary to walk its history."
782 "When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor "
783 "of refs/B, (usually, the result of last stitch). This is used for status "
784 "printing and some error error checks - especially for printing guesses what "
785 "a problem is. To determine whether a branch is is being maintained in git-"
786 "debrebase form it is necessary to walk its history."
789 #: ../git-debrebase.5.pod:387
791 msgstr "OTHER MERGES"
794 #: ../git-debrebase.5.pod:389
796 "Note that the representation described here does not permit general merges "
797 "on any of the relevant branches. For this reason the tools will try to help "
798 "the user avoid divergence of the interchange branch."
800 "Note that the representation described here does not permit general merges "
801 "on any of the relevant branches. For this reason the tools will try to help "
802 "the user avoid divergence of the interchange branch."
805 #: ../git-debrebase.5.pod:394
807 "See dgit-maint-rebase(7) for a discussion of what kinds of behaviours "
808 "should be be avoided because they might generate such merges."
810 "See dgit-maint-rebase(7) for a discussion of what kinds of behaviours "
811 "should be be avoided because they might generate such merges."
814 #: ../git-debrebase.5.pod:400
816 "Automatic resolution of divergent interchange branches (or laundering of "
817 "merges on the interchange branch) is thought to be possible, but there is "
818 "no tooling for this yet:"
820 "Automatic resolution of divergent interchange branches (or laundering of "
821 "merges on the interchange branch) is thought to be possible, but there is "
822 "no tooling for this yet:"
825 #: ../git-debrebase.5.pod:405
827 "Nonlinear (merging) history in the interchange branch is awkward because it "
828 "(obviously) does not preserve the linearity of the delta queue. Easy "
829 "merging of divergent delta queues is a research problem."
831 "Nonlinear (merging) history in the interchange branch is awkward because it "
832 "(obviously) does not preserve the linearity of the delta queue. Easy "
833 "merging of divergent delta queues is a research problem."
836 #: ../git-debrebase.5.pod:410
838 "Nonlinear (merging) history in the breakwater branch is in principle "
839 "tolerable, but each of the parents would have to be, in turn, a breakwater, "
840 "and difficult questions arise if they don't have the same anchor."
842 "Nonlinear (merging) history in the breakwater branch is in principle "
843 "tolerable, but each of the parents would have to be, in turn, a breakwater, "
844 "and difficult questions arise if they don't have the same anchor."
847 #: ../git-debrebase.5.pod:416
849 "We use the commit message annotation to distinguish the special anchor "
850 "merges from other general merges, so we can at least detect unsupported "
853 "We use the commit message annotation to distinguish the special anchor "
854 "merges from other general merges, so we can at least detect unsupported "
858 #: ../git-debrebase.5.pod:420
859 msgid "LEGAL OPERATIONS"
860 msgstr "LEGAL OPERATIONS"
863 #: ../git-debrebase.5.pod:422
865 "The following basic operations follows from this model (refer to the diagram "
868 "The following basic operations follows from this model (refer to the diagram "
872 #: ../git-debrebase.5.pod:427
873 msgid "Append linear commits"
874 msgstr "Append linear commits"
877 #: ../git-debrebase.5.pod:429
879 "No matter the branch state, it is always fine to simply git commit (or "
880 "cherry-pick etc.) commits containing upstream file changes, packaging "
883 "No matter the branch state, it is always fine to simply git commit (or "
884 "cherry-pick etc.) commits containing upstream file changes, packaging "
888 #: ../git-debrebase.5.pod:435
889 msgid "(This may make the branch unlaundered.)"
890 msgstr "(This may make the branch unlaundered.)"
893 #: ../git-debrebase.5.pod:437
894 msgid "Launder branch"
895 msgstr "Launder branch"
898 #: ../git-debrebase.5.pod:439
900 "Record the previous head in ffq-prev, if we were stitched before (and delete "
903 "Record the previous head in ffq-prev, if we were stitched before (and delete "
907 #: ../git-debrebase.5.pod:443
909 "Reorganise the current branch so that the packaging changes come first, "
910 "followed by the delta queue, turning C<-@-A-1-2-B3> into C<...@-A-B-1-2-3>."
912 "Reorganise the current branch so that the packaging changes come first, "
913 "followed by the delta queue, turning C<-@-A-1-2-B3> into C<...@-A-B-1-2-3>."
916 #: ../git-debrebase.5.pod:448
917 msgid "Drop pseudomerges and any quilt patch additions."
918 msgstr "Drop pseudomerges and any quilt patch additions."
921 #: ../git-debrebase.5.pod:450
922 msgid "Interactive rebase"
923 msgstr "Interactive rebase"
926 #: ../git-debrebase.5.pod:452
928 "With a laundered branch, one can do an interactive git rebase of the delta "
931 "With a laundered branch, one can do an interactive git rebase of the delta "
935 #: ../git-debrebase.5.pod:455
936 msgid "New upstream rebase"
937 msgstr "New upstream rebase"
940 #: ../git-debrebase.5.pod:457
942 "Start rebasing onto a new upstream version, turning C<...#..@-A-B-1-2-3> "
943 "into C<(...#..@-A-B-, ...#'-)@'-1-2>."
945 "Start rebasing onto a new upstream version, turning C<...#..@-A-B-1-2-3> "
946 "into C<(...#..@-A-B-, ...#'-)@'-1-2>."
949 #: ../git-debrebase.5.pod:460
951 "This has to be a wrapper around git-rebase, which prepares @' and then tries "
952 "to rebase 1 2 onto @'. If the user asks for an interactive rebase, @' "
953 "doesn't appear in the commit list, since @' is the newbase of the rebase "
954 "(see git-rebase(1))."
956 "This has to be a wrapper around git-rebase, which prepares @' and then tries "
957 "to rebase 1 2 onto @'. If the user asks for an interactive rebase, @' "
958 "doesn't appear in the commit list, since @' is the newbase of the rebase "
959 "(see git-rebase(1))."
962 #: ../git-debrebase.5.pod:466
964 "Note that the construction of @' cannot fail because @' simply copies "
965 "debian/ from B and and everything else from #'. (Rebasing A and B is "
966 "undesirable. We want the debian/ files to be non-rebasing so that git log "
967 "shows the packaging history.)"
969 "Note that the construction of @' cannot fail because @' simply copies "
970 "debian/ from B and and everything else from #'. (Rebasing A and B is "
971 "undesirable. We want the debian/ files to be non-rebasing so that git log "
972 "shows the packaging history.)"
975 #: ../git-debrebase.5.pod:472
980 #: ../git-debrebase.5.pod:474
982 "Make a pseudomerge, whose contributing parent to is the unstitched branch "
983 "and whose overwritten parent is ffq-prev, consuming ffq-prev in the process "
984 "(and writing debrebase-last instead). Ideally the contributing parent would "
985 "be a laundered branch, or perhaps a laundered branch with a quilt patch "
988 "Make a pseudomerge, whose contributing parent to is the unstitched branch "
989 "and whose overwritten parent is ffq-prev, consuming ffq-prev in the process "
990 "(and writing debrebase-last instead). Ideally the contributing parent would "
991 "be a laundered branch, or perhaps a laundered branch with a quilt patch "
995 #: ../git-debrebase.5.pod:483
996 msgid "Commit quilt patches"
997 msgstr "Commit quilt patches"
1000 #: ../git-debrebase.5.pod:485
1002 "To generate a tree which can be represented as a 3.0 (quilt) .dsc source "
1003 "packages, the delta queue must be reified inside the git tree in B<debian/"
1004 "patches/>. These patch files can be stripped out and/or regenerated as "
1007 "To generate a tree which can be represented as a 3.0 (quilt) .dsc source "
1008 "packages, the delta queue must be reified inside the git tree in B<debian/"
1009 "patches/>. These patch files can be stripped out and/or regenerated as "
1013 #: ../git-debrebase.5.pod:493
1014 msgid "ILLEGAL OPERATIONS"
1015 msgstr "ILLEGAL OPERATIONS"
1018 #: ../git-debrebase.5.pod:495
1020 "Some git operations are not permitted in this data model. Performing them "
1021 "will break git-debrebase."
1023 "Some git operations are not permitted in this data model. Performing them "
1024 "will break git-debrebase."
1027 #: ../git-debrebase.5.pod:500
1028 msgid "General merges"
1029 msgstr "General merges"
1032 #: ../git-debrebase.5.pod:502
1033 msgid "See L</OTHER MERGES>, above."
1034 msgstr "See L</OTHER MERGES>, above."
1037 #: ../git-debrebase.5.pod:504
1038 msgid "git-rebase starting too soon, or without base argument"
1039 msgstr "git-rebase starting too soon, or without base argument"
1042 #: ../git-debrebase.5.pod:506
1044 "git-rebase must not be invoked in such a way that the chosen base is before "
1045 "the anchor, or before the last pseudomerge. This is because git-rebase "
1046 "mangles merges. git rebase --preserve-merges is also dangerous."
1048 "git-rebase must not be invoked in such a way that the chosen base is before "
1049 "the anchor, or before the last pseudomerge. This is because git-rebase "
1050 "mangles merges. git rebase --preserve-merges is also dangerous."
1053 #: ../git-debrebase.5.pod:512
1054 msgid "git-rebase without a base argument will often start too early."
1055 msgstr "git-rebase without a base argument will often start too early."
1058 #: ../git-debrebase.5.pod:514
1060 "For these reasons, it is better to use git-debrebase and let it choose the "
1061 "base for your rebase. If you do realise you have make this mistake, it is "
1062 "best to use the reflog to recover to a suitable good previous state."
1064 "For these reasons, it is better to use git-debrebase and let it choose the "
1065 "base for your rebase. If you do realise you have make this mistake, it is "
1066 "best to use the reflog to recover to a suitable good previous state."
1069 #: ../git-debrebase.5.pod:522
1070 msgid "Editing debian/patches"
1071 msgstr "Editing debian/patches"
1074 #: ../git-debrebase.5.pod:524
1076 "debian/patches is an output from git-debrebase, not an input. If you edit "
1077 "patches git-debrebase will complain and refuse to work. If you add patches "
1078 "your work is likely to be discarded."
1080 "debian/patches is an output from git-debrebase, not an input. If you edit "
1081 "patches git-debrebase will complain and refuse to work. If you add patches "
1082 "your work is likely to be discarded."
1085 #: ../git-debrebase.5.pod:530
1087 "Instead of editing patches, use git-debrebase to edit the corresponding "
1090 "Instead of editing patches, use git-debrebase to edit the corresponding "
1094 #: ../git-debrebase.5.pod:533
1095 msgid "Renaming (etc.) branch while unstitched"
1096 msgstr "Renaming (etc.) branch while unstitched"
1099 #: ../git-debrebase.5.pod:535
1101 "The previous HEAD, which will be pseudomerged over by operations like git-"
1102 "debrebase stitch, is recorded in a ref name dervied from your branch name."
1104 "The previous HEAD, which will be pseudomerged over by operations like git-"
1105 "debrebase stitch, is recorded in a ref name dervied from your branch name."
1108 #: ../git-debrebase.5.pod:540
1110 "If you rename unstitched branches, this information can get out of step."
1112 "If you rename unstitched branches, this information can get out of step."
1115 #: ../git-debrebase.5.pod:543
1117 "Conversely, creating a new branch from an unstitched branch is good for "
1118 "making a branch to play about in, but the result cannot be stitched."
1120 "Conversely, creating a new branch from an unstitched branch is good for "
1121 "making a branch to play about in, but the result cannot be stitched."
1124 #: ../git-debrebase.5.pod:550
1125 msgid "COMMIT MESSAGE ANNOTATIONS"
1126 msgstr "COMMIT MESSAGE ANNOTATIONS"
1129 #: ../git-debrebase.5.pod:552
1131 "git-debrebase makes annotations in the messages of commits it generates."
1133 "git-debrebase makes annotations in the messages of commits it generates."
1136 #: ../git-debrebase.5.pod:555
1137 msgid "The general form is"
1138 msgstr "The general form is"
1141 #: ../git-debrebase.5.pod:557
1144 " [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]\n"
1147 " [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]\n"
1151 #: ../git-debrebase.5.pod:559
1153 "git-debrebase treats anything after the colon as a comment, paying no "
1154 "attention to PROSE."
1156 "git-debrebase treats anything after the colon as a comment, paying no "
1157 "attention to PROSE."
1160 #: ../git-debrebase.5.pod:562
1163 "The full set of annotations is:\n"
1164 " [git-debrebase split: mixed commit, debian part]\n"
1165 " [git-debrebase split: mixed commit, upstream-part]\n"
1166 " [git-debrebase onvert dgit import: debian changes]\n"
1167 " [git-debrebase anchor: convert dgit import, upstream changes]\n"
1170 "The full set of annotations is:\n"
1171 " [git-debrebase split: mixed commit, debian part]\n"
1172 " [git-debrebase split: mixed commit, upstream-part]\n"
1173 " [git-debrebase onvert dgit import: debian changes]\n"
1174 " [git-debrebase anchor: convert dgit import, upstream changes]\n"
1178 #: ../git-debrebase.5.pod:568
1181 " [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]\n"
1182 " [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]\n"
1183 " [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]\n"
1184 " [git-debrebase make-patches: export and commit patches]\n"
1187 " [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]\n"
1188 " [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]\n"
1189 " [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]\n"
1190 " [git-debrebase make-patches: export and commit patches]\n"
1194 #: ../git-debrebase.5.pod:573
1197 " [git-debrebase convert-from-gbp: drop patches]\n"
1198 " [git-debrebase anchor: declare upstream]\n"
1199 " [git-debrebase pseudomerge: stitch]\n"
1202 " [git-debrebase convert-from-gbp: drop patches]\n"
1203 " [git-debrebase anchor: declare upstream]\n"
1204 " [git-debrebase pseudomerge: stitch]\n"
1208 #: ../git-debrebase.5.pod:577
1211 " [git-debrebase merged-breakwater: constructed from vanilla merge]\n"
1214 " [git-debrebase merged-breakwater: constructed from vanilla merge]\n"
1218 #: ../git-debrebase.5.pod:579
1221 " [git-debrebase convert-to-gbp: commit patches]\n"
1222 " [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]\n"
1223 " [git-debrebase convert-from-dgit-view drop-patches]\n"
1226 " [git-debrebase convert-to-gbp: commit patches]\n"
1227 " [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]\n"
1228 " [git-debrebase convert-from-dgit-view drop-patches]\n"
1232 #: ../git-debrebase.5.pod:583
1234 "Only anchor merges have the C<[git-debrebase anchor: ...]> tag. Single-"
1235 "parent anchors are not generated by git-debrebase, and when made manually "
1236 "should not contain any C<[git-debrebase ...]> annotation."
1238 "Only anchor merges have the C<[git-debrebase anchor: ...]> tag. Single-"
1239 "parent anchors are not generated by git-debrebase, and when made manually "
1240 "should not contain any C<[git-debrebase ...]> annotation."
1243 #: ../git-debrebase.5.pod:588
1245 "The C<split mixed commit> and C<convert dgit import> tags are added to the "
1246 "pre-existing commit message, when git-debrebase rewrites the commit."
1248 "The C<split mixed commit> and C<convert dgit import> tags are added to the "
1249 "pre-existing commit message, when git-debrebase rewrites the commit."
1252 #: ../git-debrebase.5.pod:592
1253 msgid "APPENDIX - DGIT IMPORT HANDLING"
1254 msgstr "APPENDIX - DGIT IMPORT HANDLING"
1257 #: ../git-debrebase.5.pod:594
1259 "The dgit .dsc import format is not documented or specified (so some of the "
1260 "following terms are not defined anywhere). The dgit import format it is "
1261 "defined by the implementation in dgit, of which git-debrebase has special "
1264 "The dgit .dsc import format is not documented or specified (so some of the "
1265 "following terms are not defined anywhere). The dgit import format it is "
1266 "defined by the implementation in dgit, of which git-debrebase has special "
1270 #: ../git-debrebase.5.pod:599
1271 msgid "Consider a non-dgit NMU followed by a dgit NMU:"
1272 msgstr "Consider a non-dgit NMU followed by a dgit NMU:"
1275 #: ../git-debrebase.5.pod:601
1278 " interchange --/--B3!--%--//----D*-->\n"
1289 " --@--A breakwater\n"
1291 " --#--------> upstream\n"
1294 " interchange --/--B3!--%--//----D*-->\n"
1305 " --@--A breakwater\n"
1307 " --#--------> upstream\n"
1311 #: ../git-debrebase.5.pod:617
1314 " Supplementary key:\n"
1317 " Supplementary key:\n"
1321 #: ../git-debrebase.5.pod:619
1324 " =XBC% dgit tarball import of .debian.tar.gz containing\n"
1325 " Debian packaging including changes B C and quilt patches\n"
1326 " 0 dgit tarball import of upstream tarball\n"
1327 " 00 dgit tarball import of supplementary upstream piece\n"
1328 " &_ dgit import nearly-breakwater-anchor\n"
1329 " // dgit fetch / import-dsc pseudomerge to make fast forward\n"
1332 " =XBC% dgit tarball import of .debian.tar.gz containing\n"
1333 " Debian packaging including changes B C and quilt patches\n"
1334 " 0 dgit tarball import of upstream tarball\n"
1335 " 00 dgit tarball import of supplementary upstream piece\n"
1336 " &_ dgit import nearly-breakwater-anchor\n"
1337 " // dgit fetch / import-dsc pseudomerge to make fast forward\n"
1341 #: ../git-debrebase.5.pod:626
1344 " &' git-debrebase converted import (upstream files only)\n"
1345 " C' git-debrebase converted packaging change import\n"
1348 " &' git-debrebase converted import (upstream files only)\n"
1349 " C' git-debrebase converted packaging change import\n"
1353 #: ../git-debrebase.5.pod:629
1356 " * ** before and after HEAD\n"
1359 " * ** before and after HEAD\n"
1363 #: ../git-debrebase.5.pod:631
1364 msgid "We want to transform this into:"
1365 msgstr "We want to transform this into:"
1368 #: ../git-debrebase.5.pod:635
1369 msgid "I. No new upstream version"
1370 msgstr "I. No new upstream version"
1373 #: ../git-debrebase.5.pod:637
1377 " --/--B3!--%--//-----D*-------------/-->\n"
1388 " --@--A-----B---------------------C'---D\n"
1390 " --#----------------------------------------->\n"
1394 " --/--B3!--%--//-----D*-------------/-->\n"
1405 " --@--A-----B---------------------C'---D\n"
1407 " --#----------------------------------------->\n"
1411 #: ../git-debrebase.5.pod:653
1412 msgid "II. New upstream"
1413 msgstr "II. New upstream"
1416 #: ../git-debrebase.5.pod:655
1426 #: ../git-debrebase.5.pod:657
1429 " --/--B3!--%--//-----D*-------------/-->\n"
1440 " --@--A-----B-----------------@---C'---D\n"
1442 " --#--------------------- - - / - - --------->\n"
1449 " --/--B3!--%--//-----D*-------------/-->\n"
1460 " --@--A-----B-----------------@---C'---D\n"
1462 " --#--------------------- - - / - - --------->\n"
1470 #: ../git-debrebase.5.pod:680
1471 msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1)"
1472 msgstr "git-debrebase(1), dgit-maint-rebase(7), dgit(1)"