1 # SOME DESCRIPTIVE TITLE
2 # Copyright (C) YEAR Free Software Foundation, Inc.
3 # This file is distributed under the same license as the PACKAGE package.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
9 "Project-Id-Version: PACKAGE VERSION\n"
10 "POT-Creation-Date: 2018-10-04 01:04+0100\n"
11 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
12 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13 "Language-Team: LANGUAGE <LL@li.org>\n"
16 "Content-Type: text/plain; charset=UTF-8\n"
17 "Content-Transfer-Encoding: 8bit\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."
56 #: ../git-debrebase.5.pod:3
57 msgid "git-debrebase - git data model for Debian packaging"
61 #: ../git-debrebase.5.pod:11
63 "The Debian packaging has a fast forwarding history. The delta queue "
64 "(changes to upstream files) is represented as a series of individual git "
65 "commits, which can worked on with rebase, and also shared."
69 #: ../git-debrebase.5.pod:18
74 #: ../git-debrebase.5.pod:20
76 "git-debrebase is designed to work well with dgit. git-debrebase can also be "
77 "used in workflows without source packages, for example to work on Debian-"
78 "format packages outside or alongside Debian."
82 #: ../git-debrebase.5.pod:24
84 "git-debrebase itself is not very suitable for use by Debian derivatives, to "
85 "work on packages inherited from Debian, because it assumes that you want to "
86 "throw away any packaging provided by your upstream. However, use of git-"
87 "debrebase in Debian does not make anything harder for derivatives, and it "
88 "can make some things easier."
92 #: ../git-debrebase.5.pod:32
94 "When using gitk on branches managed by git-debrebase, B<gitk --date-order>, "
95 "B<gitk --first-parent> and B<gitk -- :.> (or B<gitk .>) produce more useful "
96 "output than the default."
100 #: ../git-debrebase.5.pod:37
105 #: ../git-debrebase.5.pod:41
110 #: ../git-debrebase.5.pod:43
112 "A merge which does not actually merge the trees; instead, it is constructed "
113 "by taking the tree from one of the parents (ignoring the contents of the "
114 "other parents). These are used to make a rewritten history fast forward "
115 "from a previous tip, so that it can be pushed and pulled normally. Manual "
116 "construction of pseudomerges can be done with C<git merge -s ours> but is "
117 "not normally needed when using git-debrebase."
121 #: ../git-debrebase.5.pod:54
122 msgid "Packaging files"
126 #: ../git-debrebase.5.pod:56
128 "Files in the source tree within B<debian/>, excluding anything in B<debian/"
133 #: ../git-debrebase.5.pod:59
138 #: ../git-debrebase.5.pod:61
140 "The version of the package without Debian's packaging. Typically provided "
141 "by the actual upstream project, and sometimes tracked by Debian contributors "
142 "in a branch C<upstream>."
146 #: ../git-debrebase.5.pod:65
148 "Upstream contains upstream files, but some upstreams also contain packaging "
149 "files in B<debian/>. Any such non-upstream files found in upstream are "
150 "thrown away by git-debrebase each time a new upstream version is "
155 #: ../git-debrebase.5.pod:71
156 msgid "Upstream files"
160 #: ../git-debrebase.5.pod:73
162 "Files in the source tree outside B<debian/>. These may include unmodified "
163 "source from upstream, but also files which have been modified or created for "
168 #: ../git-debrebase.5.pod:77
173 #: ../git-debrebase.5.pod:79
174 msgid "Debian's changes to upstream files: a series of git commits."
178 #: ../git-debrebase.5.pod:82
179 msgid "Quilt patches"
183 #: ../git-debrebase.5.pod:84
185 "Files in B<debian/patches/> generated for the benefit of dpkg-source's 3.0 "
186 "(quilt) .dsc source package format. Not used, often deleted, and "
187 "regenerated when needed (such as when uploading to Debian), by git-debrebase."
191 #: ../git-debrebase.5.pod:90
192 msgid "Interchange branch; breakwater; stitched; laundered"
196 #: ../git-debrebase.5.pod:92
197 msgid "See L</BRANCHES AND BRANCH STATES - OVERVIEW>."
201 #: ../git-debrebase.5.pod:94
202 msgid "Anchor; Packaging"
206 #: ../git-debrebase.5.pod:96
207 msgid "See L</BRANCH CONTENTS - DETAILED SPECIFICATION>."
211 #: ../git-debrebase.5.pod:98
212 msgid "ffq-prev; debrebase-last"
216 #: ../git-debrebase.5.pod:100
217 msgid "See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>."
221 #: ../git-debrebase.5.pod:104
226 #: ../git-debrebase.5.pod:106
229 " ------/--A!----/--B3!--%--/--> interchange view\n"
230 " / / / with debian/ directory\n"
231 " % % % entire delta queue applied\n"
232 " / / / 3.0 (quilt) has debian/patches\n"
233 " / / 3* \"master\" on Debian git servers\n"
237 " 1 1 1 breakwater branch, merging baseline\n"
238 " / / / unmodified upstream code\n"
239 " ---@-----@--A----@--B--C plus debian/ (but no debian/patches)\n"
240 " / / / no ref refers to this: we\n"
241 " --#-----#-------#-----> upstream reconstruct its identity by\n"
242 " inspecting interchange branch\n"
248 #: ../git-debrebase.5.pod:122
251 " 1,2,3 commits touching upstream files only\n"
252 " A,B,C commits touching debian/ only\n"
253 " B3 mixed commit (eg made by an NMUer)\n"
254 " # upstream releases\n"
259 #: ../git-debrebase.5.pod:127
262 " -@- anchor merge, takes contents of debian/ from the\n"
263 " / previous `breakwater' commit and rest from upstream\n"
268 #: ../git-debrebase.5.pod:130
271 " -/- pseudomerge; contents are identical to\n"
272 " / parent lower on diagram.\n"
277 #: ../git-debrebase.5.pod:133
280 " % dgit- or git-debrebase- generated commit of debian/patches.\n"
281 " `3.0 (quilt)' only; generally dropped by git-debrebase.\n"
286 #: ../git-debrebase.5.pod:136
289 " * Maintainer's HEAD was here while they were editing,\n"
290 " before they said they were done, at which point their\n"
291 " tools made -/- (and maybe %) to convert to\n"
292 " the fast-forwarding interchange branch.\n"
297 #: ../git-debrebase.5.pod:141
300 " ! NMUer's HEAD was here when they said `dgit push'.\n"
301 " Rebase branch launderer turns each ! into an\n"
307 #: ../git-debrebase.5.pod:145
308 msgid "BRANCHES AND BRANCH STATES - OVERVIEW"
312 #: ../git-debrebase.5.pod:147
314 "git-debrebase has one primary branch, the B<interchange branch>. This "
315 "branch is found on Debian contributor's workstations (typically, a "
316 "maintainer would call it B<master>), in the Debian dgit git server as the "
317 "suite branch (B<dgit/dgit/sid>) and on other git servers which support "
318 "Debian work (eg B<master> on salsa)."
322 #: ../git-debrebase.5.pod:155
324 "The interchange branch is fast-forwarding (by virtue of pseudomerges, where "
329 #: ../git-debrebase.5.pod:158
331 "It is possible to have multiple different interchange branches for the same "
332 "package, stored as different local and remote git branches. However, "
333 "divergence should be avoided where possible - see L</OTHER MERGES>."
337 #: ../git-debrebase.5.pod:164
339 "A suitable interchange branch can be used directly with dgit. In this case "
340 "each dgit archive suite branch is a separate interchange branch."
344 #: ../git-debrebase.5.pod:168
346 "Within the ancestry of the interchange branch, there is another important, "
347 "implicit branch, the B<breakwater>. The breakwater contains unmodified "
348 "upstream source, but with Debian's packaging superimposed (replacing any "
349 "C<debian/> directory that may be in the upstream commits). The breakwater "
350 "does not contain any representation of the delta queue (not even debian/"
351 "patches). The part of the breakwater processed by git-debrebase is the part "
352 "since the most reecent B<anchor>, which is usually a special merge generated "
357 #: ../git-debrebase.5.pod:181
359 "When working, locally, the user's branch can be in a rebasing state, known "
360 "as B<unstitched>. While a branch is unstitched, it is not in interchange "
361 "format. The previous interchange branch tip is recorded, so that the "
362 "previous history and the user's work can later be stitched into the fast-"
363 "forwarding interchange form."
367 #: ../git-debrebase.5.pod:193
369 "An unstitched branch may be in B<laundered> state, which means it has a more "
370 "particular special form convenient for manipulating the delta queue."
374 #: ../git-debrebase.5.pod:199
375 msgid "BRANCH CONTENTS - DETAILED SPECIFICATION"
379 #: ../git-debrebase.5.pod:201
381 "It is most convenient to describe the B<breakwater> branch first. A "
382 "breakwater is B<fast-forwarding>, but is not usually named by a ref. It "
383 "contains B<in this order> (ancestors first):"
387 #: ../git-debrebase.5.pod:210
392 #: ../git-debrebase.5.pod:212
393 msgid "An B<anchor> commit, which is usually a special two-parent merge:"
397 #: ../git-debrebase.5.pod:215
399 "The first parent contains the most recent version, at that point, of the "
400 "Debian packaging (in debian/); it also often contains upstream files, but "
401 "they are to be ignored. Often the first parent is a previous breakwater tip."
405 #: ../git-debrebase.5.pod:222
407 "The second parent is an upstream source commit. It may sometimes contain a "
408 "debian/ subdirectory, but if so that is to be ignored. The second parent's "
409 "upstream files are identical to the anchor's. Anchor merges always contain "
410 "C<[git-debrebase anchor: ...]> as a line in the commit message."
414 #: ../git-debrebase.5.pod:232
416 "Alternatively, an anchor may be a single-parent commit which introduces the "
417 "C<debian/> directory and makes no other changes: ie, the start of Debian "
422 #: ../git-debrebase.5.pod:237
427 #: ../git-debrebase.5.pod:239
429 "Zero or more single-parent commits containing only packaging changes. (And "
430 "no quilt patch changes.)"
434 #: ../git-debrebase.5.pod:245
436 "The B<laundered> branch state is B<rebasing>. A laundered branch is based "
437 "on a breakwater but also contains, additionally, B<after> the breakwater, a "
438 "representation of the delta queue:"
442 #: ../git-debrebase.5.pod:255
443 msgid "Delta queue commits"
447 #: ../git-debrebase.5.pod:257
449 "Zero or more single-parent commits contaioning only changes to upstream "
454 #: ../git-debrebase.5.pod:262
456 "The merely B<unstitched> (ie, unstitched but unlaundered) branch state is "
457 "also B<rebasing>. It has the same contents as the laundered state, except "
458 "that it may contain, additionally, in B<in any order but after the "
463 #: ../git-debrebase.5.pod:273
464 msgid "Linear commits to the source"
468 #: ../git-debrebase.5.pod:275
470 "Further commit(s) containing changes to to upstream files and/or to "
471 "packaging, possibly mixed within a single commit. (But not quilt patch "
476 #: ../git-debrebase.5.pod:282
477 msgid "Quilt patch addition for `3.0 (quilt)'"
481 #: ../git-debrebase.5.pod:284
483 "Commit(s) which add patches to B<debian/patches/>, and add those patches to "
484 "the end of B<series>."
488 #: ../git-debrebase.5.pod:287
490 "These are only necessary when working with packages in C<.dsc 3.0 (quilt)> "
491 "format. For git-debrebase they are purely an output; they are deleted when "
492 "branches are laundered. git-debrebase takes care to make a proper patch "
493 "series out of the delta queue, so that any resulting source packages are "
498 #: ../git-debrebase.5.pod:297
500 "Finally, an B<interchange> branch is B<fast forwarding>. It has the same "
501 "contents as an unlaundered branch state, but may (and usually will) "
502 "additionally contain (in some order, possibly intermixed with the extra "
503 "commits which may be found on an unstitched unlaundered branch):"
507 #: ../git-debrebase.5.pod:309
508 msgid "Pseudomerge to make fast forward"
512 #: ../git-debrebase.5.pod:311
514 "A pseudomerge making the branch fast forward from previous history. The "
515 "contributing parent is itself in interchange format. Normally the "
516 "overwritten parent is a previous tip of an interchange branch, but this is "
517 "not necessary as the overwritten parent is not examined."
521 #: ../git-debrebase.5.pod:319
523 "If the two parents have identical trees, the one with the later commit date "
524 "(or, if the commit dates are the same, the first parent) is treated as the "
525 "contributing parent."
529 #: ../git-debrebase.5.pod:326
530 msgid "dgit dsc import pseudomerge"
534 #: ../git-debrebase.5.pod:328
536 "Debian .dsc source package import(s) made by dgit (during dgit fetch of a "
537 "package most recently uploaded to Debian without dgit, or during dgit import-"
542 #: ../git-debrebase.5.pod:334
544 "git-debrebase requires that each such import is in the fast-forwarding "
545 "format produced by dgit: a two-parent pseudomerge, whose contributing parent "
546 "is in the non-fast-forwarding dgit dsc import format (not described further "
547 "here), and whose overwritten parent is the previous interchange tip (eg, the "
548 "previous tip of the dgit suite branch)."
552 #: ../git-debrebase.5.pod:347
553 msgid "STITCHING, PSEUDO-MERGES, FFQ RECORD"
557 #: ../git-debrebase.5.pod:349
559 "Whenever the branch C<refs/B> is unstitched, the previous head is recorded "
560 "in the git ref C<refs/ffq-prev/B>."
564 #: ../git-debrebase.5.pod:352
566 "Unstiched branches are not fast forward from the published interchange "
567 "branches [1]. So before a branch can be pushed, the right pseudomerge must "
568 "be reestablished. This is the stitch operation, which consumes the ffq-prev "
573 #: ../git-debrebase.5.pod:359
575 "When the user has an unstitched branch, they may rewrite it freely, from the "
576 "breakwater tip onwards. Such a git rebase is the default operation for git-"
577 "debrebase. Rebases should not go back before the breakwater tip, and "
578 "certainly not before the most recent anchor."
582 #: ../git-debrebase.5.pod:366
584 "Unstitched branches must not be pushed to interchange branch refs (by the "
585 "use of C<git push -f> or equivalent). It is OK to share an unstitched "
586 "branch in similar circumstances and with similar warnings to sharing any "
587 "other rebasing git branch."
591 #: ../git-debrebase.5.pod:372
593 "[1] Strictly, for a package which has never had a Debian delta queue, the "
594 "interchange and breakwater branches may be identical, in which case the "
595 "unstitched branch is fast forward from the interchange branch and no "
596 "pseudomerge is needed."
600 #: ../git-debrebase.5.pod:378
602 "When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor "
603 "of refs/B, (usually, the result of last stitch). This is used for status "
604 "printing and some error error checks - especially for printing guesses what "
605 "a problem is. To determine whether a branch is is being maintained in git-"
606 "debrebase form it is necessary to walk its history."
610 #: ../git-debrebase.5.pod:387
615 #: ../git-debrebase.5.pod:389
617 "Note that the representation described here does not permit general merges "
618 "on any of the relevant branches. For this reason the tools will try to help "
619 "the user avoid divergence of the interchange branch."
623 #: ../git-debrebase.5.pod:394
625 "See dgit-maint-rebase(7) for a discussion of what kinds of behaviours "
626 "should be be avoided because they might generate such merges."
630 #: ../git-debrebase.5.pod:400
632 "Automatic resolution of divergent interchange branches (or laundering of "
633 "merges on the interchange branch) is thought to be possible, but there is "
634 "no tooling for this yet:"
638 #: ../git-debrebase.5.pod:405
640 "Nonlinear (merging) history in the interchange branch is awkward because it "
641 "(obviously) does not preserve the linearity of the delta queue. Easy "
642 "merging of divergent delta queues is a research problem."
646 #: ../git-debrebase.5.pod:410
648 "Nonlinear (merging) history in the breakwater branch is in principle "
649 "tolerable, but each of the parents would have to be, in turn, a breakwater, "
650 "and difficult questions arise if they don't have the same anchor."
654 #: ../git-debrebase.5.pod:416
656 "We use the commit message annotation to distinguish the special anchor "
657 "merges from other general merges, so we can at least detect unsupported "
662 #: ../git-debrebase.5.pod:420
663 msgid "LEGAL OPERATIONS"
667 #: ../git-debrebase.5.pod:422
669 "The following basic operations follows from this model (refer to the diagram "
674 #: ../git-debrebase.5.pod:427
675 msgid "Append linear commits"
679 #: ../git-debrebase.5.pod:429
681 "No matter the branch state, it is always fine to simply git commit (or "
682 "cherry-pick etc.) commits containing upstream file changes, packaging "
687 #: ../git-debrebase.5.pod:435
688 msgid "(This may make the branch unlaundered.)"
692 #: ../git-debrebase.5.pod:437
693 msgid "Launder branch"
697 #: ../git-debrebase.5.pod:439
699 "Record the previous head in ffq-prev, if we were stitched before (and delete "
704 #: ../git-debrebase.5.pod:443
706 "Reorganise the current branch so that the packaging changes come first, "
707 "followed by the delta queue, turning C<-@-A-1-2-B3> into C<...@-A-B-1-2-3>."
711 #: ../git-debrebase.5.pod:448
712 msgid "Drop pseudomerges and any quilt patch additions."
716 #: ../git-debrebase.5.pod:450
717 msgid "Interactive rebase"
721 #: ../git-debrebase.5.pod:452
723 "With a laundered branch, one can do an interactive git rebase of the delta "
728 #: ../git-debrebase.5.pod:455
729 msgid "New upstream rebase"
733 #: ../git-debrebase.5.pod:457
735 "Start rebasing onto a new upstream version, turning C<...#..@-A-B-1-2-3> "
736 "into C<(...#..@-A-B-, ...#'-)@'-1-2>."
740 #: ../git-debrebase.5.pod:460
742 "This has to be a wrapper around git-rebase, which prepares @' and then tries "
743 "to rebase 1 2 onto @'. If the user asks for an interactive rebase, @' "
744 "doesn't appear in the commit list, since @' is the newbase of the rebase "
745 "(see git-rebase(1))."
749 #: ../git-debrebase.5.pod:466
751 "Note that the construction of @' cannot fail because @' simply copies "
752 "debian/ from B and and everything else from #'. (Rebasing A and B is "
753 "undesirable. We want the debian/ files to be non-rebasing so that git log "
754 "shows the packaging history.)"
758 #: ../git-debrebase.5.pod:472
763 #: ../git-debrebase.5.pod:474
765 "Make a pseudomerge, whose contributing parent to is the unstitched branch "
766 "and whose overwritten parent is ffq-prev, consuming ffq-prev in the process "
767 "(and writing debrebase-last instead). Ideally the contributing parent would "
768 "be a laundered branch, or perhaps a laundered branch with a quilt patch "
773 #: ../git-debrebase.5.pod:483
774 msgid "Commit quilt patches"
778 #: ../git-debrebase.5.pod:485
780 "To generate a tree which can be represented as a 3.0 (quilt) .dsc source "
781 "packages, the delta queue must be reified inside the git tree in B<debian/"
782 "patches/>. These patch files can be stripped out and/or regenerated as "
787 #: ../git-debrebase.5.pod:493
788 msgid "ILLEGAL OPERATIONS"
792 #: ../git-debrebase.5.pod:495
794 "Some git operations are not permitted in this data model. Performing them "
795 "will break git-debrebase."
799 #: ../git-debrebase.5.pod:500
800 msgid "General merges"
804 #: ../git-debrebase.5.pod:502
805 msgid "See L</OTHER MERGES>, above."
809 #: ../git-debrebase.5.pod:504
810 msgid "git-rebase starting too soon, or without base argument"
814 #: ../git-debrebase.5.pod:506
816 "git-rebase must not be invoked in such a way that the chosen base is before "
817 "the anchor, or before the last pseudomerge. This is because git-rebase "
818 "mangles merges. git rebase --preserve-merges is also dangerous."
822 #: ../git-debrebase.5.pod:512
823 msgid "git-rebase without a base argument will often start too early."
827 #: ../git-debrebase.5.pod:514
829 "For these reasons, it is better to use git-debrebase and let it choose the "
830 "base for your rebase. If you do realise you have make this mistake, it is "
831 "best to use the reflog to recover to a suitable good previous state."
835 #: ../git-debrebase.5.pod:522
836 msgid "Editing debian/patches"
840 #: ../git-debrebase.5.pod:524
842 "debian/patches is an output from git-debrebase, not an input. If you edit "
843 "patches git-debrebase will complain and refuse to work. If you add patches "
844 "your work is likely to be discarded."
848 #: ../git-debrebase.5.pod:530
850 "Instead of editing patches, use git-debrebase to edit the corresponding "
855 #: ../git-debrebase.5.pod:533
856 msgid "Renaming (etc.) branch while unstitched"
860 #: ../git-debrebase.5.pod:535
862 "The previous HEAD, which will be pseudomerged over by operations like git-"
863 "debrebase stitch, is recorded in a ref name dervied from your branch name."
867 #: ../git-debrebase.5.pod:540
869 "If you rename unstitched branches, this information can get out of step."
873 #: ../git-debrebase.5.pod:543
875 "Conversely, creating a new branch from an unstitched branch is good for "
876 "making a branch to play about in, but the result cannot be stitched."
880 #: ../git-debrebase.5.pod:550
881 msgid "COMMIT MESSAGE ANNOTATIONS"
885 #: ../git-debrebase.5.pod:552
887 "git-debrebase makes annotations in the messages of commits it generates."
891 #: ../git-debrebase.5.pod:555
892 msgid "The general form is"
896 #: ../git-debrebase.5.pod:557
899 " [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]\n"
904 #: ../git-debrebase.5.pod:559
906 "git-debrebase treats anything after the colon as a comment, paying no "
907 "attention to PROSE."
911 #: ../git-debrebase.5.pod:562
914 "The full set of annotations is:\n"
915 " [git-debrebase split: mixed commit, debian part]\n"
916 " [git-debrebase split: mixed commit, upstream-part]\n"
917 " [git-debrebase onvert dgit import: debian changes]\n"
918 " [git-debrebase anchor: convert dgit import, upstream changes]\n"
923 #: ../git-debrebase.5.pod:568
926 " [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]\n"
927 " [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]\n"
928 " [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]\n"
929 " [git-debrebase make-patches: export and commit patches]\n"
934 #: ../git-debrebase.5.pod:573
937 " [git-debrebase convert-from-gbp: drop patches]\n"
938 " [git-debrebase anchor: declare upstream]\n"
939 " [git-debrebase pseudomerge: stitch]\n"
944 #: ../git-debrebase.5.pod:577
947 " [git-debrebase merged-breakwater: constructed from vanilla merge]\n"
952 #: ../git-debrebase.5.pod:579
955 " [git-debrebase convert-to-gbp: commit patches]\n"
956 " [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]\n"
957 " [git-debrebase convert-from-dgit-view drop-patches]\n"
962 #: ../git-debrebase.5.pod:583
964 "Only anchor merges have the C<[git-debrebase anchor: ...]> tag. Single-"
965 "parent anchors are not generated by git-debrebase, and when made manually "
966 "should not contain any C<[git-debrebase ...]> annotation."
970 #: ../git-debrebase.5.pod:588
972 "The C<split mixed commit> and C<convert dgit import> tags are added to the "
973 "pre-existing commit message, when git-debrebase rewrites the commit."
977 #: ../git-debrebase.5.pod:592
978 msgid "APPENDIX - DGIT IMPORT HANDLING"
982 #: ../git-debrebase.5.pod:594
984 "The dgit .dsc import format is not documented or specified (so some of the "
985 "following terms are not defined anywhere). The dgit import format it is "
986 "defined by the implementation in dgit, of which git-debrebase has special "
991 #: ../git-debrebase.5.pod:599
992 msgid "Consider a non-dgit NMU followed by a dgit NMU:"
996 #: ../git-debrebase.5.pod:601
999 " interchange --/--B3!--%--//----D*-->\n"
1010 " --@--A breakwater\n"
1012 " --#--------> upstream\n"
1017 #: ../git-debrebase.5.pod:617
1020 " Supplementary key:\n"
1025 #: ../git-debrebase.5.pod:619
1028 " =XBC% dgit tarball import of .debian.tar.gz containing\n"
1029 " Debian packaging including changes B C and quilt patches\n"
1030 " 0 dgit tarball import of upstream tarball\n"
1031 " 00 dgit tarball import of supplementary upstream piece\n"
1032 " &_ dgit import nearly-breakwater-anchor\n"
1033 " // dgit fetch / import-dsc pseudomerge to make fast forward\n"
1038 #: ../git-debrebase.5.pod:626
1041 " &' git-debrebase converted import (upstream files only)\n"
1042 " C' git-debrebase converted packaging change import\n"
1047 #: ../git-debrebase.5.pod:629
1050 " * ** before and after HEAD\n"
1055 #: ../git-debrebase.5.pod:631
1056 msgid "We want to transform this into:"
1060 #: ../git-debrebase.5.pod:635
1061 msgid "I. No new upstream version"
1065 #: ../git-debrebase.5.pod:637
1069 " --/--B3!--%--//-----D*-------------/-->\n"
1080 " --@--A-----B---------------------C'---D\n"
1082 " --#----------------------------------------->\n"
1087 #: ../git-debrebase.5.pod:653
1088 msgid "II. New upstream"
1092 #: ../git-debrebase.5.pod:655
1100 #: ../git-debrebase.5.pod:657
1103 " --/--B3!--%--//-----D*-------------/-->\n"
1114 " --@--A-----B-----------------@---C'---D\n"
1116 " --#--------------------- - - / - - --------->\n"
1125 #: ../git-debrebase.5.pod:680
1126 msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1)"