summaryrefslogtreecommitdiff
path: root/po4a/git-debrebase_5.en_US.po
blob: e8ea8b7808adcd5e3998ac3574efd9cc213cc35d (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
# English translations for po package
# Copyright (C) 2018 Free Software Foundation, Inc.
# This file is distributed under the same license as the po package.
# Automatically generated, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: po 4a\n"
"POT-Creation-Date: 2018-10-04 01:04+0100\n"
"PO-Revision-Date: 2018-10-04 01:04+0100\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"Language: en_US\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"

#. type: =head1
#: ../dgit.1:3 ../dgit.7:2 ../dgit-user.7.pod:1 ../dgit-nmu-simple.7.pod:1
#: ../dgit-maint-native.7.pod:1 ../dgit-maint-merge.7.pod:1
#: ../dgit-maint-gbp.7.pod:1 ../dgit-maint-debrebase.7.pod:1
#: ../dgit-downstream-dsc.7.pod:1 ../dgit-sponsorship.7.pod:1
#: ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
#, no-wrap
msgid "NAME"
msgstr "NAME"

#. type: =head1
#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:126
#: ../dgit-maint-merge.7.pod:491 ../dgit-maint-gbp.7.pod:136
#: ../dgit-maint-debrebase.7.pod:722 ../dgit-downstream-dsc.7.pod:352
#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:601
#: ../git-debrebase.5.pod:678
#, no-wrap
msgid "SEE ALSO"
msgstr "SEE ALSO"

#. type: =head1
#: ../dgit-user.7.pod:5 ../dgit-maint-native.7.pod:5
#: ../dgit-maint-merge.7.pod:5 ../dgit-maint-gbp.7.pod:5
#: ../dgit-maint-debrebase.7.pod:5 ../dgit-downstream-dsc.7.pod:5
#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr "INTRODUCTION"

#. type: textblock
#: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7
msgid ""
"git-debrebase is a tool for representing in git, and manpulating, Debian "
"packages based on upstream source code."
msgstr ""
"git-debrebase is a tool for representing in git, and manpulating, Debian "
"packages based on upstream source code."

#. type: textblock
#: ../git-debrebase.5.pod:3
msgid "git-debrebase - git data model for Debian packaging"
msgstr "git-debrebase - git data model for Debian packaging"

#. type: textblock
#: ../git-debrebase.5.pod:11
msgid ""
"The Debian packaging has a fast forwarding history.  The delta queue "
"(changes to upstream files) is represented as a series of individual git "
"commits, which can worked on with rebase, and also shared."
msgstr ""
"The Debian packaging has a fast forwarding history.  The delta queue "
"(changes to upstream files) is represented as a series of individual git "
"commits, which can worked on with rebase, and also shared."

#. type: =head2
#: ../git-debrebase.5.pod:18
msgid "DISCUSSION"
msgstr "DISCUSSION"

#. type: textblock
#: ../git-debrebase.5.pod:20
msgid ""
"git-debrebase is designed to work well with dgit.  git-debrebase can also be "
"used in workflows without source packages, for example to work on Debian-"
"format packages outside or alongside Debian."
msgstr ""
"git-debrebase is designed to work well with dgit.  git-debrebase can also be "
"used in workflows without source packages, for example to work on Debian-"
"format packages outside or alongside Debian."

#. type: textblock
#: ../git-debrebase.5.pod:24
msgid ""
"git-debrebase itself is not very suitable for use by Debian derivatives, to "
"work on packages inherited from Debian, because it assumes that you want to "
"throw away any packaging provided by your upstream.  However, use of git-"
"debrebase in Debian does not make anything harder for derivatives, and it "
"can make some things easier."
msgstr ""
"git-debrebase itself is not very suitable for use by Debian derivatives, to "
"work on packages inherited from Debian, because it assumes that you want to "
"throw away any packaging provided by your upstream.  However, use of git-"
"debrebase in Debian does not make anything harder for derivatives, and it "
"can make some things easier."

#. type: textblock
#: ../git-debrebase.5.pod:32
msgid ""
"When using gitk on branches managed by git-debrebase, B<gitk --date-order>, "
"B<gitk --first-parent> and B<gitk -- :.> (or B<gitk .>)  produce more useful "
"output than the default."
msgstr ""
"When using gitk on branches managed by git-debrebase, B<gitk --date-order>, "
"B<gitk --first-parent> and B<gitk -- :.> (or B<gitk .>)  produce more useful "
"output than the default."

#. type: =head1
#: ../git-debrebase.5.pod:37
msgid "TERMINOLOGY"
msgstr "TERMINOLOGY"

#. type: =item
#: ../git-debrebase.5.pod:41
msgid "Pseudomerge"
msgstr "Pseudomerge"

#. type: textblock
#: ../git-debrebase.5.pod:43
msgid ""
"A merge which does not actually merge the trees; instead, it is constructed "
"by taking the tree from one of the parents (ignoring the contents of the "
"other parents).  These are used to make a rewritten history fast forward "
"from a previous tip, so that it can be pushed and pulled normally.  Manual "
"construction of pseudomerges can be done with C<git merge -s ours> but is "
"not normally needed when using git-debrebase."
msgstr ""
"A merge which does not actually merge the trees; instead, it is constructed "
"by taking the tree from one of the parents (ignoring the contents of the "
"other parents).  These are used to make a rewritten history fast forward "
"from a previous tip, so that it can be pushed and pulled normally.  Manual "
"construction of pseudomerges can be done with C<git merge -s ours> but is "
"not normally needed when using git-debrebase."

#. type: =item
#: ../git-debrebase.5.pod:54
msgid "Packaging files"
msgstr "Packaging files"

#. type: textblock
#: ../git-debrebase.5.pod:56
msgid ""
"Files in the source tree within B<debian/>, excluding anything in B<debian/"
"patches/>."
msgstr ""
"Files in the source tree within B<debian/>, excluding anything in B<debian/"
"patches/>."

#. type: =item
#: ../git-debrebase.5.pod:59
msgid "Upstream"
msgstr "Upstream"

#. type: textblock
#: ../git-debrebase.5.pod:61
msgid ""
"The version of the package without Debian's packaging.  Typically provided "
"by the actual upstream project, and sometimes tracked by Debian contributors "
"in a branch C<upstream>."
msgstr ""
"The version of the package without Debian's packaging.  Typically provided "
"by the actual upstream project, and sometimes tracked by Debian contributors "
"in a branch C<upstream>."

#. type: textblock
#: ../git-debrebase.5.pod:65
msgid ""
"Upstream contains upstream files, but some upstreams also contain packaging "
"files in B<debian/>.  Any such non-upstream files found in upstream are "
"thrown away by git-debrebase each time a new upstream version is "
"incorporated."
msgstr ""
"Upstream contains upstream files, but some upstreams also contain packaging "
"files in B<debian/>.  Any such non-upstream files found in upstream are "
"thrown away by git-debrebase each time a new upstream version is "
"incorporated."

#. type: =item
#: ../git-debrebase.5.pod:71
msgid "Upstream files"
msgstr "Upstream files"

#. type: textblock
#: ../git-debrebase.5.pod:73
msgid ""
"Files in the source tree outside B<debian/>.  These may include unmodified "
"source from upstream, but also files which have been modified or created for "
"Debian."
msgstr ""
"Files in the source tree outside B<debian/>.  These may include unmodified "
"source from upstream, but also files which have been modified or created for "
"Debian."

#. type: =item
#: ../git-debrebase.5.pod:77
msgid "Delta queue"
msgstr "Delta queue"

#. type: textblock
#: ../git-debrebase.5.pod:79
msgid "Debian's changes to upstream files: a series of git commits."
msgstr "Debian's changes to upstream files: a series of git commits."

#. type: =item
#: ../git-debrebase.5.pod:82
msgid "Quilt patches"
msgstr "Quilt patches"

#. type: textblock
#: ../git-debrebase.5.pod:84
msgid ""
"Files in B<debian/patches/> generated for the benefit of dpkg-source's 3.0 "
"(quilt) .dsc source package format.  Not used, often deleted, and "
"regenerated when needed (such as when uploading to Debian), by git-debrebase."
msgstr ""
"Files in B<debian/patches/> generated for the benefit of dpkg-source's 3.0 "
"(quilt) .dsc source package format.  Not used, often deleted, and "
"regenerated when needed (such as when uploading to Debian), by git-debrebase."

#. type: =item
#: ../git-debrebase.5.pod:90
msgid "Interchange branch; breakwater; stitched; laundered"
msgstr "Interchange branch; breakwater; stitched; laundered"

#. type: textblock
#: ../git-debrebase.5.pod:92
msgid "See L</BRANCHES AND BRANCH STATES - OVERVIEW>."
msgstr "See L</BRANCHES AND BRANCH STATES - OVERVIEW>."

#. type: =item
#: ../git-debrebase.5.pod:94
msgid "Anchor; Packaging"
msgstr "Anchor; Packaging"

#. type: textblock
#: ../git-debrebase.5.pod:96
msgid "See L</BRANCH CONTENTS - DETAILED SPECIFICATION>."
msgstr "See L</BRANCH CONTENTS - DETAILED SPECIFICATION>."

#. type: =item
#: ../git-debrebase.5.pod:98
msgid "ffq-prev; debrebase-last"
msgstr "ffq-prev; debrebase-last"

#. type: textblock
#: ../git-debrebase.5.pod:100
msgid "See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>."
msgstr "See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>."

#. type: =head1
#: ../git-debrebase.5.pod:104
msgid "DIAGRAM"
msgstr "DIAGRAM"

#. type: verbatim
#: ../git-debrebase.5.pod:106
#, no-wrap
msgid ""
"           ------/--A!----/--B3!--%--/--> interchange view\n"
"                /        /          /      with debian/ directory\n"
"               %        %          %       entire delta queue applied\n"
"              /        /          /        3.0 (quilt) has debian/patches\n"
"             /        /          3*       \"master\" on Debian git servers\n"
"            /        /          /\n"
"           2*       2*         2\n"
"          /        /          /\n"
"         1        1          1    breakwater branch, merging baseline\n"
"        /        /          /     unmodified upstream code\n"
"    ---@-----@--A----@--B--C      plus debian/ (but no debian/patches)\n"
"      /     /       /                     no ref refers to this: we\n"
"   --#-----#-------#-----> upstream        reconstruct its identity by\n"
"                                           inspecting interchange branch\n"
"    Key:\n"
"\n"
msgstr ""
"           ------/--A!----/--B3!--%--/--> interchange view\n"
"                /        /          /      with debian/ directory\n"
"               %        %          %       entire delta queue applied\n"
"              /        /          /        3.0 (quilt) has debian/patches\n"
"             /        /          3*       \"master\" on Debian git servers\n"
"            /        /          /\n"
"           2*       2*         2\n"
"          /        /          /\n"
"         1        1          1    breakwater branch, merging baseline\n"
"        /        /          /     unmodified upstream code\n"
"    ---@-----@--A----@--B--C      plus debian/ (but no debian/patches)\n"
"      /     /       /                     no ref refers to this: we\n"
"   --#-----#-------#-----> upstream        reconstruct its identity by\n"
"                                           inspecting interchange branch\n"
"    Key:\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:122
#, no-wrap
msgid ""
"      1,2,3   commits touching upstream files only\n"
"      A,B,C   commits touching debian/ only\n"
"      B3      mixed commit (eg made by an NMUer)\n"
"      #       upstream releases\n"
"\n"
msgstr ""
"      1,2,3   commits touching upstream files only\n"
"      A,B,C   commits touching debian/ only\n"
"      B3      mixed commit (eg made by an NMUer)\n"
"      #       upstream releases\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:127
#, no-wrap
msgid ""
"     -@-      anchor merge, takes contents of debian/ from the\n"
"     /         previous `breakwater' commit and rest from upstream\n"
"\n"
msgstr ""
"     -@-      anchor merge, takes contents of debian/ from the\n"
"     /         previous `breakwater' commit and rest from upstream\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:130
#, no-wrap
msgid ""
"     -/-      pseudomerge; contents are identical to\n"
"     /         parent lower on diagram.\n"
"\n"
msgstr ""
"     -/-      pseudomerge; contents are identical to\n"
"     /         parent lower on diagram.\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:133
#, no-wrap
msgid ""
"      %       dgit- or git-debrebase- generated commit of debian/patches.\n"
"              `3.0 (quilt)' only; generally dropped by git-debrebase.\n"
"\n"
msgstr ""
"      %       dgit- or git-debrebase- generated commit of debian/patches.\n"
"              `3.0 (quilt)' only; generally dropped by git-debrebase.\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:136
#, no-wrap
msgid ""
"      *       Maintainer's HEAD was here while they were editing,\n"
"              before they said they were done, at which point their\n"
"              tools made -/- (and maybe %) to convert to\n"
"              the fast-forwarding interchange branch.\n"
"\n"
msgstr ""
"      *       Maintainer's HEAD was here while they were editing,\n"
"              before they said they were done, at which point their\n"
"              tools made -/- (and maybe %) to convert to\n"
"              the fast-forwarding interchange branch.\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:141
#, no-wrap
msgid ""
"      !       NMUer's HEAD was here when they said `dgit push'.\n"
"              Rebase branch launderer turns each ! into an\n"
"              equivalent *.\n"
"\n"
msgstr ""
"      !       NMUer's HEAD was here when they said `dgit push'.\n"
"              Rebase branch launderer turns each ! into an\n"
"              equivalent *.\n"
"\n"

#. type: =head1
#: ../git-debrebase.5.pod:145
msgid "BRANCHES AND BRANCH STATES - OVERVIEW"
msgstr "BRANCHES AND BRANCH STATES - OVERVIEW"

#. type: textblock
#: ../git-debrebase.5.pod:147
msgid ""
"git-debrebase has one primary branch, the B<interchange branch>.  This "
"branch is found on Debian contributor's workstations (typically, a "
"maintainer would call it B<master>), in the Debian dgit git server as the "
"suite branch (B<dgit/dgit/sid>)  and on other git servers which support "
"Debian work (eg B<master> on salsa)."
msgstr ""
"git-debrebase has one primary branch, the B<interchange branch>.  This "
"branch is found on Debian contributor's workstations (typically, a "
"maintainer would call it B<master>), in the Debian dgit git server as the "
"suite branch (B<dgit/dgit/sid>)  and on other git servers which support "
"Debian work (eg B<master> on salsa)."

#. type: textblock
#: ../git-debrebase.5.pod:155
msgid ""
"The interchange branch is fast-forwarding (by virtue of pseudomerges, where "
"necessary)."
msgstr ""
"The interchange branch is fast-forwarding (by virtue of pseudomerges, where "
"necessary)."

#. type: textblock
#: ../git-debrebase.5.pod:158
msgid ""
"It is possible to have multiple different interchange branches for the same "
"package, stored as different local and remote git branches.  However, "
"divergence should be avoided where possible - see L</OTHER MERGES>."
msgstr ""
"It is possible to have multiple different interchange branches for the same "
"package, stored as different local and remote git branches.  However, "
"divergence should be avoided where possible - see L</OTHER MERGES>."

#. type: textblock
#: ../git-debrebase.5.pod:164
msgid ""
"A suitable interchange branch can be used directly with dgit.  In this case "
"each dgit archive suite branch is a separate interchange branch."
msgstr ""
"A suitable interchange branch can be used directly with dgit.  In this case "
"each dgit archive suite branch is a separate interchange branch."

#. type: textblock
#: ../git-debrebase.5.pod:168
msgid ""
"Within the ancestry of the interchange branch, there is another important, "
"implicit branch, the B<breakwater>.  The breakwater contains unmodified "
"upstream source, but with Debian's packaging superimposed (replacing any "
"C<debian/> directory that may be in the upstream commits).  The breakwater "
"does not contain any representation of the delta queue (not even debian/"
"patches).  The part of the breakwater processed by git-debrebase is the part "
"since the most reecent B<anchor>, which is usually a special merge generated "
"by git-debrebase."
msgstr ""
"Within the ancestry of the interchange branch, there is another important, "
"implicit branch, the B<breakwater>.  The breakwater contains unmodified "
"upstream source, but with Debian's packaging superimposed (replacing any "
"C<debian/> directory that may be in the upstream commits).  The breakwater "
"does not contain any representation of the delta queue (not even debian/"
"patches).  The part of the breakwater processed by git-debrebase is the part "
"since the most reecent B<anchor>, which is usually a special merge generated "
"by git-debrebase."

#. type: textblock
#: ../git-debrebase.5.pod:181
msgid ""
"When working, locally, the user's branch can be in a rebasing state, known "
"as B<unstitched>.  While a branch is unstitched, it is not in interchange "
"format.  The previous interchange branch tip is recorded, so that the "
"previous history and the user's work can later be stitched into the fast-"
"forwarding interchange form."
msgstr ""
"When working, locally, the user's branch can be in a rebasing state, known "
"as B<unstitched>.  While a branch is unstitched, it is not in interchange "
"format.  The previous interchange branch tip is recorded, so that the "
"previous history and the user's work can later be stitched into the fast-"
"forwarding interchange form."

#. type: textblock
#: ../git-debrebase.5.pod:193
msgid ""
"An unstitched branch may be in B<laundered> state, which means it has a more "
"particular special form convenient for manipulating the delta queue."
msgstr ""
"An unstitched branch may be in B<laundered> state, which means it has a more "
"particular special form convenient for manipulating the delta queue."

#. type: =head1
#: ../git-debrebase.5.pod:199
msgid "BRANCH CONTENTS - DETAILED SPECIFICATION"
msgstr "BRANCH CONTENTS - DETAILED SPECIFICATION"

#. type: textblock
#: ../git-debrebase.5.pod:201
msgid ""
"It is most convenient to describe the B<breakwater> branch first.  A "
"breakwater is B<fast-forwarding>, but is not usually named by a ref.  It "
"contains B<in this order> (ancestors first):"
msgstr ""
"It is most convenient to describe the B<breakwater> branch first.  A "
"breakwater is B<fast-forwarding>, but is not usually named by a ref.  It "
"contains B<in this order> (ancestors first):"

#. type: =item
#: ../git-debrebase.5.pod:210
msgid "Anchor"
msgstr "Anchor"

#. type: textblock
#: ../git-debrebase.5.pod:212
msgid "An B<anchor> commit, which is usually a special two-parent merge:"
msgstr "An B<anchor> commit, which is usually a special two-parent merge:"

#. type: textblock
#: ../git-debrebase.5.pod:215
msgid ""
"The first parent contains the most recent version, at that point, of the "
"Debian packaging (in debian/); it also often contains upstream files, but "
"they are to be ignored.  Often the first parent is a previous breakwater tip."
msgstr ""
"The first parent contains the most recent version, at that point, of the "
"Debian packaging (in debian/); it also often contains upstream files, but "
"they are to be ignored.  Often the first parent is a previous breakwater tip."

#. type: textblock
#: ../git-debrebase.5.pod:222
msgid ""
"The second parent is an upstream source commit.  It may sometimes contain a "
"debian/ subdirectory, but if so that is to be ignored.  The second parent's "
"upstream files are identical to the anchor's.  Anchor merges always contain "
"C<[git-debrebase anchor: ...]> as a line in the commit message."
msgstr ""
"The second parent is an upstream source commit.  It may sometimes contain a "
"debian/ subdirectory, but if so that is to be ignored.  The second parent's "
"upstream files are identical to the anchor's.  Anchor merges always contain "
"C<[git-debrebase anchor: ...]> as a line in the commit message."

#. type: textblock
#: ../git-debrebase.5.pod:232
msgid ""
"Alternatively, an anchor may be a single-parent commit which introduces the "
"C<debian/> directory and makes no other changes: ie, the start of Debian "
"packaging."
msgstr ""
"Alternatively, an anchor may be a single-parent commit which introduces the "
"C<debian/> directory and makes no other changes: ie, the start of Debian "
"packaging."

#. type: =item
#: ../git-debrebase.5.pod:237
msgid "Packaging"
msgstr "Packaging"

#. type: textblock
#: ../git-debrebase.5.pod:239
msgid ""
"Zero or more single-parent commits containing only packaging changes.  (And "
"no quilt patch changes.)"
msgstr ""
"Zero or more single-parent commits containing only packaging changes.  (And "
"no quilt patch changes.)"

#. type: textblock
#: ../git-debrebase.5.pod:245
msgid ""
"The B<laundered> branch state is B<rebasing>.  A laundered branch is based "
"on a breakwater but also contains, additionally, B<after> the breakwater, a "
"representation of the delta queue:"
msgstr ""
"The B<laundered> branch state is B<rebasing>.  A laundered branch is based "
"on a breakwater but also contains, additionally, B<after> the breakwater, a "
"representation of the delta queue:"

#. type: =item
#: ../git-debrebase.5.pod:255
msgid "Delta queue commits"
msgstr "Delta queue commits"

#. type: textblock
#: ../git-debrebase.5.pod:257
msgid ""
"Zero or more single-parent commits contaioning only changes to upstream "
"files."
msgstr ""
"Zero or more single-parent commits contaioning only changes to upstream "
"files."

#. type: textblock
#: ../git-debrebase.5.pod:262
msgid ""
"The merely B<unstitched> (ie, unstitched but unlaundered)  branch state is "
"also B<rebasing>.  It has the same contents as the laundered state, except "
"that it may contain, additionally, in B<in any order but after the "
"breakwater>:"
msgstr ""
"The merely B<unstitched> (ie, unstitched but unlaundered)  branch state is "
"also B<rebasing>.  It has the same contents as the laundered state, except "
"that it may contain, additionally, in B<in any order but after the "
"breakwater>:"

#. type: =item
#: ../git-debrebase.5.pod:273
msgid "Linear commits to the source"
msgstr "Linear commits to the source"

#. type: textblock
#: ../git-debrebase.5.pod:275
msgid ""
"Further commit(s) containing changes to to upstream files and/or to "
"packaging, possibly mixed within a single commit.  (But not quilt patch "
"changes.)"
msgstr ""
"Further commit(s) containing changes to to upstream files and/or to "
"packaging, possibly mixed within a single commit.  (But not quilt patch "
"changes.)"

#. type: =item
#: ../git-debrebase.5.pod:282
msgid "Quilt patch addition for `3.0 (quilt)'"
msgstr "Quilt patch addition for `3.0 (quilt)'"

#. type: textblock
#: ../git-debrebase.5.pod:284
msgid ""
"Commit(s) which add patches to B<debian/patches/>, and add those patches to "
"the end of B<series>."
msgstr ""
"Commit(s) which add patches to B<debian/patches/>, and add those patches to "
"the end of B<series>."

#. type: textblock
#: ../git-debrebase.5.pod:287
msgid ""
"These are only necessary when working with packages in C<.dsc 3.0 (quilt)> "
"format.  For git-debrebase they are purely an output; they are deleted when "
"branches are laundered.  git-debrebase takes care to make a proper patch "
"series out of the delta queue, so that any resulting source packages are "
"nice."
msgstr ""
"These are only necessary when working with packages in C<.dsc 3.0 (quilt)> "
"format.  For git-debrebase they are purely an output; they are deleted when "
"branches are laundered.  git-debrebase takes care to make a proper patch "
"series out of the delta queue, so that any resulting source packages are "
"nice."

#. type: textblock
#: ../git-debrebase.5.pod:297
msgid ""
"Finally, an B<interchange> branch is B<fast forwarding>.  It has the same "
"contents as an unlaundered branch state, but may (and usually will) "
"additionally contain (in some order, possibly intermixed with the extra "
"commits which may be found on an unstitched unlaundered branch):"
msgstr ""
"Finally, an B<interchange> branch is B<fast forwarding>.  It has the same "
"contents as an unlaundered branch state, but may (and usually will) "
"additionally contain (in some order, possibly intermixed with the extra "
"commits which may be found on an unstitched unlaundered branch):"

#. type: =item
#: ../git-debrebase.5.pod:309
msgid "Pseudomerge to make fast forward"
msgstr "Pseudomerge to make fast forward"

#. type: textblock
#: ../git-debrebase.5.pod:311
msgid ""
"A pseudomerge making the branch fast forward from previous history.  The "
"contributing parent is itself in interchange format.  Normally the "
"overwritten parent is a previous tip of an interchange branch, but this is "
"not necessary as the overwritten parent is not examined."
msgstr ""
"A pseudomerge making the branch fast forward from previous history.  The "
"contributing parent is itself in interchange format.  Normally the "
"overwritten parent is a previous tip of an interchange branch, but this is "
"not necessary as the overwritten parent is not examined."

#. type: textblock
#: ../git-debrebase.5.pod:319
msgid ""
"If the two parents have identical trees, the one with the later commit date "
"(or, if the commit dates are the same, the first parent)  is treated as the "
"contributing parent."
msgstr ""
"If the two parents have identical trees, the one with the later commit date "
"(or, if the commit dates are the same, the first parent)  is treated as the "
"contributing parent."

#. type: =item
#: ../git-debrebase.5.pod:326
msgid "dgit dsc import pseudomerge"
msgstr "dgit dsc import pseudomerge"

#. type: textblock
#: ../git-debrebase.5.pod:328
msgid ""
"Debian .dsc source package import(s)  made by dgit (during dgit fetch of a "
"package most recently uploaded to Debian without dgit, or during dgit import-"
"dsc)."
msgstr ""
"Debian .dsc source package import(s)  made by dgit (during dgit fetch of a "
"package most recently uploaded to Debian without dgit, or during dgit import-"
"dsc)."

#. type: textblock
#: ../git-debrebase.5.pod:334
msgid ""
"git-debrebase requires that each such import is in the fast-forwarding "
"format produced by dgit: a two-parent pseudomerge, whose contributing parent "
"is in the non-fast-forwarding dgit dsc import format (not described further "
"here), and whose overwritten parent is the previous interchange tip (eg, the "
"previous tip of the dgit suite branch)."
msgstr ""
"git-debrebase requires that each such import is in the fast-forwarding "
"format produced by dgit: a two-parent pseudomerge, whose contributing parent "
"is in the non-fast-forwarding dgit dsc import format (not described further "
"here), and whose overwritten parent is the previous interchange tip (eg, the "
"previous tip of the dgit suite branch)."

#. type: =head1
#: ../git-debrebase.5.pod:347
msgid "STITCHING, PSEUDO-MERGES, FFQ RECORD"
msgstr "STITCHING, PSEUDO-MERGES, FFQ RECORD"

#. type: textblock
#: ../git-debrebase.5.pod:349
msgid ""
"Whenever the branch C<refs/B> is unstitched, the previous head is recorded "
"in the git ref C<refs/ffq-prev/B>."
msgstr ""
"Whenever the branch C<refs/B> is unstitched, the previous head is recorded "
"in the git ref C<refs/ffq-prev/B>."

#. type: textblock
#: ../git-debrebase.5.pod:352
msgid ""
"Unstiched branches are not fast forward from the published interchange "
"branches [1].  So before a branch can be pushed, the right pseudomerge must "
"be reestablished.  This is the stitch operation, which consumes the ffq-prev "
"ref."
msgstr ""
"Unstiched branches are not fast forward from the published interchange "
"branches [1].  So before a branch can be pushed, the right pseudomerge must "
"be reestablished.  This is the stitch operation, which consumes the ffq-prev "
"ref."

#. type: textblock
#: ../git-debrebase.5.pod:359
msgid ""
"When the user has an unstitched branch, they may rewrite it freely, from the "
"breakwater tip onwards.  Such a git rebase is the default operation for git-"
"debrebase.  Rebases should not go back before the breakwater tip, and "
"certainly not before the most recent anchor."
msgstr ""
"When the user has an unstitched branch, they may rewrite it freely, from the "
"breakwater tip onwards.  Such a git rebase is the default operation for git-"
"debrebase.  Rebases should not go back before the breakwater tip, and "
"certainly not before the most recent anchor."

#. type: textblock
#: ../git-debrebase.5.pod:366
msgid ""
"Unstitched branches must not be pushed to interchange branch refs (by the "
"use of C<git push -f> or equivalent).  It is OK to share an unstitched "
"branch in similar circumstances and with similar warnings to sharing any "
"other rebasing git branch."
msgstr ""
"Unstitched branches must not be pushed to interchange branch refs (by the "
"use of C<git push -f> or equivalent).  It is OK to share an unstitched "
"branch in similar circumstances and with similar warnings to sharing any "
"other rebasing git branch."

#. type: textblock
#: ../git-debrebase.5.pod:372
msgid ""
"[1] Strictly, for a package which has never had a Debian delta queue, the "
"interchange and breakwater branches may be identical, in which case the "
"unstitched branch is fast forward from the interchange branch and no "
"pseudomerge is needed."
msgstr ""
"[1] Strictly, for a package which has never had a Debian delta queue, the "
"interchange and breakwater branches may be identical, in which case the "
"unstitched branch is fast forward from the interchange branch and no "
"pseudomerge is needed."

#. type: textblock
#: ../git-debrebase.5.pod:378
msgid ""
"When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor "
"of refs/B, (usually, the result of last stitch).  This is used for status "
"printing and some error error checks - especially for printing guesses what "
"a problem is.  To determine whether a branch is is being maintained in git-"
"debrebase form it is necessary to walk its history."
msgstr ""
"When ffq-prev is not present, C<refs/debrebase-last/B> records some ancestor "
"of refs/B, (usually, the result of last stitch).  This is used for status "
"printing and some error error checks - especially for printing guesses what "
"a problem is.  To determine whether a branch is is being maintained in git-"
"debrebase form it is necessary to walk its history."

#. type: =head1
#: ../git-debrebase.5.pod:387
msgid "OTHER MERGES"
msgstr "OTHER MERGES"

#. type: textblock
#: ../git-debrebase.5.pod:389
msgid ""
"Note that the representation described here does not permit general merges "
"on any of the relevant branches.  For this reason the tools will try to help "
"the user avoid divergence of the interchange branch."
msgstr ""
"Note that the representation described here does not permit general merges "
"on any of the relevant branches.  For this reason the tools will try to help "
"the user avoid divergence of the interchange branch."

#. type: textblock
#: ../git-debrebase.5.pod:394
msgid ""
"See dgit-maint-rebase(7)  for a discussion of what kinds of behaviours "
"should be be avoided because they might generate such merges."
msgstr ""
"See dgit-maint-rebase(7)  for a discussion of what kinds of behaviours "
"should be be avoided because they might generate such merges."

#. type: textblock
#: ../git-debrebase.5.pod:400
msgid ""
"Automatic resolution of divergent interchange branches (or laundering of "
"merges on the interchange branch)  is thought to be possible, but there is "
"no tooling for this yet:"
msgstr ""
"Automatic resolution of divergent interchange branches (or laundering of "
"merges on the interchange branch)  is thought to be possible, but there is "
"no tooling for this yet:"

#. type: textblock
#: ../git-debrebase.5.pod:405
msgid ""
"Nonlinear (merging) history in the interchange branch is awkward because it "
"(obviously) does not preserve the linearity of the delta queue.  Easy "
"merging of divergent delta queues is a research problem."
msgstr ""
"Nonlinear (merging) history in the interchange branch is awkward because it "
"(obviously) does not preserve the linearity of the delta queue.  Easy "
"merging of divergent delta queues is a research problem."

#. type: textblock
#: ../git-debrebase.5.pod:410
msgid ""
"Nonlinear (merging) history in the breakwater branch is in principle "
"tolerable, but each of the parents would have to be, in turn, a breakwater, "
"and difficult questions arise if they don't have the same anchor."
msgstr ""
"Nonlinear (merging) history in the breakwater branch is in principle "
"tolerable, but each of the parents would have to be, in turn, a breakwater, "
"and difficult questions arise if they don't have the same anchor."

#. type: textblock
#: ../git-debrebase.5.pod:416
msgid ""
"We use the commit message annotation to distinguish the special anchor "
"merges from other general merges, so we can at least detect unsupported "
"merges."
msgstr ""
"We use the commit message annotation to distinguish the special anchor "
"merges from other general merges, so we can at least detect unsupported "
"merges."

#. type: =head1
#: ../git-debrebase.5.pod:420
msgid "LEGAL OPERATIONS"
msgstr "LEGAL OPERATIONS"

#. type: textblock
#: ../git-debrebase.5.pod:422
msgid ""
"The following basic operations follows from this model (refer to the diagram "
"above):"
msgstr ""
"The following basic operations follows from this model (refer to the diagram "
"above):"

#. type: =item
#: ../git-debrebase.5.pod:427
msgid "Append linear commits"
msgstr "Append linear commits"

#. type: textblock
#: ../git-debrebase.5.pod:429
msgid ""
"No matter the branch state, it is always fine to simply git commit (or "
"cherry-pick etc.)  commits containing upstream file changes, packaging "
"changes, or both."
msgstr ""
"No matter the branch state, it is always fine to simply git commit (or "
"cherry-pick etc.)  commits containing upstream file changes, packaging "
"changes, or both."

#. type: textblock
#: ../git-debrebase.5.pod:435
msgid "(This may make the branch unlaundered.)"
msgstr "(This may make the branch unlaundered.)"

#. type: =item
#: ../git-debrebase.5.pod:437
msgid "Launder branch"
msgstr "Launder branch"

#. type: textblock
#: ../git-debrebase.5.pod:439
msgid ""
"Record the previous head in ffq-prev, if we were stitched before (and delete "
"debrebase-last)."
msgstr ""
"Record the previous head in ffq-prev, if we were stitched before (and delete "
"debrebase-last)."

#. type: textblock
#: ../git-debrebase.5.pod:443
msgid ""
"Reorganise the current branch so that the packaging changes come first, "
"followed by the delta queue, turning C<-@-A-1-2-B3> into C<...@-A-B-1-2-3>."
msgstr ""
"Reorganize the current branch so that the packaging changes come first, "
"followed by the delta queue, turning C<-@-A-1-2-B3> into C<...@-A-B-1-2-3>."

#. type: textblock
#: ../git-debrebase.5.pod:448
msgid "Drop pseudomerges and any quilt patch additions."
msgstr "Drop pseudomerges and any quilt patch additions."

#. type: =item
#: ../git-debrebase.5.pod:450
msgid "Interactive rebase"
msgstr "Interactive rebase"

#. type: textblock
#: ../git-debrebase.5.pod:452
msgid ""
"With a laundered branch, one can do an interactive git rebase of the delta "
"queue."
msgstr ""
"With a laundered branch, one can do an interactive git rebase of the delta "
"queue."

#. type: =item
#: ../git-debrebase.5.pod:455
msgid "New upstream rebase"
msgstr "New upstream rebase"

#. type: textblock
#: ../git-debrebase.5.pod:457
msgid ""
"Start rebasing onto a new upstream version, turning C<...#..@-A-B-1-2-3> "
"into C<(...#..@-A-B-, ...#'-)@'-1-2>."
msgstr ""
"Start rebasing onto a new upstream version, turning C<...#..@-A-B-1-2-3> "
"into C<(...#..@-A-B-, ...#'-)@'-1-2>."

#. type: textblock
#: ../git-debrebase.5.pod:460
msgid ""
"This has to be a wrapper around git-rebase, which prepares @' and then tries "
"to rebase 1 2 onto @'.  If the user asks for an interactive rebase, @' "
"doesn't appear in the commit list, since @' is the newbase of the rebase "
"(see git-rebase(1))."
msgstr ""
"This has to be a wrapper around git-rebase, which prepares @' and then tries "
"to rebase 1 2 onto @'.  If the user asks for an interactive rebase, @' "
"doesn't appear in the commit list, since @' is the newbase of the rebase "
"(see git-rebase(1))."

#. type: textblock
#: ../git-debrebase.5.pod:466
msgid ""
"Note that the construction of @' cannot fail because @' simply copies "
"debian/ from B and and everything else from #'.  (Rebasing A and B is "
"undesirable.  We want the debian/ files to be non-rebasing so that git log "
"shows the packaging history.)"
msgstr ""
"Note that the construction of @' cannot fail because @' simply copies "
"debian/ from B and and everything else from #'.  (Rebasing A and B is "
"undesirable.  We want the debian/ files to be non-rebasing so that git log "
"shows the packaging history.)"

#. type: =item
#: ../git-debrebase.5.pod:472
msgid "Stitch"
msgstr "Stitch"

#. type: textblock
#: ../git-debrebase.5.pod:474
msgid ""
"Make a pseudomerge, whose contributing parent to is the unstitched branch "
"and whose overwritten parent is ffq-prev, consuming ffq-prev in the process "
"(and writing debrebase-last instead).  Ideally the contributing parent would "
"be a laundered branch, or perhaps a laundered branch with a quilt patch "
"addition commit."
msgstr ""
"Make a pseudomerge, whose contributing parent to is the unstitched branch "
"and whose overwritten parent is ffq-prev, consuming ffq-prev in the process "
"(and writing debrebase-last instead).  Ideally the contributing parent would "
"be a laundered branch, or perhaps a laundered branch with a quilt patch "
"addition commit."

#. type: =item
#: ../git-debrebase.5.pod:483
msgid "Commit quilt patches"
msgstr "Commit quilt patches"

#. type: textblock
#: ../git-debrebase.5.pod:485
msgid ""
"To generate a tree which can be represented as a 3.0 (quilt) .dsc source "
"packages, the delta queue must be reified inside the git tree in B<debian/"
"patches/>.  These patch files can be stripped out and/or regenerated as "
"needed."
msgstr ""
"To generate a tree which can be represented as a 3.0 (quilt) .dsc source "
"packages, the delta queue must be reified inside the git tree in B<debian/"
"patches/>.  These patch files can be stripped out and/or regenerated as "
"needed."

#. type: =head1
#: ../git-debrebase.5.pod:493
msgid "ILLEGAL OPERATIONS"
msgstr "ILLEGAL OPERATIONS"

#. type: textblock
#: ../git-debrebase.5.pod:495
msgid ""
"Some git operations are not permitted in this data model.  Performing them "
"will break git-debrebase."
msgstr ""
"Some git operations are not permitted in this data model.  Performing them "
"will break git-debrebase."

#. type: =item
#: ../git-debrebase.5.pod:500
msgid "General merges"
msgstr "General merges"

#. type: textblock
#: ../git-debrebase.5.pod:502
msgid "See L</OTHER MERGES>, above."
msgstr "See L</OTHER MERGES>, above."

#. type: =item
#: ../git-debrebase.5.pod:504
msgid "git-rebase starting too soon, or without base argument"
msgstr "git-rebase starting too soon, or without base argument"

#. type: textblock
#: ../git-debrebase.5.pod:506
msgid ""
"git-rebase must not be invoked in such a way that the chosen base is before "
"the anchor, or before the last pseudomerge.  This is because git-rebase "
"mangles merges.  git rebase --preserve-merges is also dangerous."
msgstr ""
"git-rebase must not be invoked in such a way that the chosen base is before "
"the anchor, or before the last pseudomerge.  This is because git-rebase "
"mangles merges.  git rebase --preserve-merges is also dangerous."

#. type: textblock
#: ../git-debrebase.5.pod:512
msgid "git-rebase without a base argument will often start too early."
msgstr "git-rebase without a base argument will often start too early."

#. type: textblock
#: ../git-debrebase.5.pod:514
msgid ""
"For these reasons, it is better to use git-debrebase and let it choose the "
"base for your rebase.  If you do realise you have make this mistake, it is "
"best to use the reflog to recover to a suitable good previous state."
msgstr ""
"For these reasons, it is better to use git-debrebase and let it choose the "
"base for your rebase.  If you do realise you have make this mistake, it is "
"best to use the reflog to recover to a suitable good previous state."

#. type: =item
#: ../git-debrebase.5.pod:522
msgid "Editing debian/patches"
msgstr "Editing debian/patches"

#. type: textblock
#: ../git-debrebase.5.pod:524
msgid ""
"debian/patches is an output from git-debrebase, not an input.  If you edit "
"patches git-debrebase will complain and refuse to work.  If you add patches "
"your work is likely to be discarded."
msgstr ""
"debian/patches is an output from git-debrebase, not an input.  If you edit "
"patches git-debrebase will complain and refuse to work.  If you add patches "
"your work is likely to be discarded."

#. type: textblock
#: ../git-debrebase.5.pod:530
msgid ""
"Instead of editing patches, use git-debrebase to edit the corresponding "
"commits."
msgstr ""
"Instead of editing patches, use git-debrebase to edit the corresponding "
"commits."

#. type: =item
#: ../git-debrebase.5.pod:533
msgid "Renaming (etc.) branch while unstitched"
msgstr "Renaming (etc.) branch while unstitched"

#. type: textblock
#: ../git-debrebase.5.pod:535
msgid ""
"The previous HEAD, which will be pseudomerged over by operations like git-"
"debrebase stitch, is recorded in a ref name dervied from your branch name."
msgstr ""
"The previous HEAD, which will be pseudomerged over by operations like git-"
"debrebase stitch, is recorded in a ref name dervied from your branch name."

#. type: textblock
#: ../git-debrebase.5.pod:540
msgid ""
"If you rename unstitched branches, this information can get out of step."
msgstr ""
"If you rename unstitched branches, this information can get out of step."

#. type: textblock
#: ../git-debrebase.5.pod:543
msgid ""
"Conversely, creating a new branch from an unstitched branch is good for "
"making a branch to play about in, but the result cannot be stitched."
msgstr ""
"Conversely, creating a new branch from an unstitched branch is good for "
"making a branch to play about in, but the result cannot be stitched."

#. type: =head1
#: ../git-debrebase.5.pod:550
msgid "COMMIT MESSAGE ANNOTATIONS"
msgstr "COMMIT MESSAGE ANNOTATIONS"

#. type: textblock
#: ../git-debrebase.5.pod:552
msgid ""
"git-debrebase makes annotations in the messages of commits it generates."
msgstr ""
"git-debrebase makes annotations in the messages of commits it generates."

#. type: textblock
#: ../git-debrebase.5.pod:555
msgid "The general form is"
msgstr "The general form is"

#. type: verbatim
#: ../git-debrebase.5.pod:557
#, no-wrap
msgid ""
"  [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]\n"
"\n"
msgstr ""
"  [git-debrebase COMMIT-TYPE [ ARGS...]: PROSE, MORE PROSE]\n"
"\n"

#. type: textblock
#: ../git-debrebase.5.pod:559
msgid ""
"git-debrebase treats anything after the colon as a comment, paying no "
"attention to PROSE."
msgstr ""
"git-debrebase treats anything after the colon as a comment, paying no "
"attention to PROSE."

#. type: verbatim
#: ../git-debrebase.5.pod:562
#, no-wrap
msgid ""
"The full set of annotations is:\n"
"  [git-debrebase split: mixed commit, debian part]\n"
"  [git-debrebase split: mixed commit, upstream-part]\n"
"  [git-debrebase onvert dgit import: debian changes]\n"
"  [git-debrebase anchor: convert dgit import, upstream changes]\n"
"\n"
msgstr ""
"The full set of annotations is:\n"
"  [git-debrebase split: mixed commit, debian part]\n"
"  [git-debrebase split: mixed commit, upstream-part]\n"
"  [git-debrebase onvert dgit import: debian changes]\n"
"  [git-debrebase anchor: convert dgit import, upstream changes]\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:568
#, no-wrap
msgid ""
"  [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]\n"
"  [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]\n"
"  [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]\n"
"  [git-debrebase make-patches: export and commit patches]\n"
"\n"
msgstr ""
"  [git-debrebase upstream-combine . PIECE[ PIECE...]: new upstream]\n"
"  [git-debrebase anchor: new upstream NEW-UPSTREAM-VERSION, merge]\n"
"  [git-debrebase changelog: new upstream NEW-UPSTREAM-VERSION]\n"
"  [git-debrebase make-patches: export and commit patches]\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:573
#, no-wrap
msgid ""
"  [git-debrebase convert-from-gbp: drop patches]\n"
"  [git-debrebase anchor: declare upstream]\n"
"  [git-debrebase pseudomerge: stitch]\n"
"\n"
msgstr ""
"  [git-debrebase convert-from-gbp: drop patches]\n"
"  [git-debrebase anchor: declare upstream]\n"
"  [git-debrebase pseudomerge: stitch]\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:577
#, no-wrap
msgid ""
"  [git-debrebase merged-breakwater: constructed from vanilla merge]\n"
"\n"
msgstr ""
"  [git-debrebase merged-breakwater: constructed from vanilla merge]\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:579
#, no-wrap
msgid ""
"  [git-debrebase convert-to-gbp: commit patches]\n"
"  [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]\n"
"  [git-debrebase convert-from-dgit-view drop-patches]\n"
"\n"
msgstr ""
"  [git-debrebase convert-to-gbp: commit patches]\n"
"  [git-debrebase convert-from-dgit-view upstream-import-convert: VERSION]\n"
"  [git-debrebase convert-from-dgit-view drop-patches]\n"
"\n"

#. type: textblock
#: ../git-debrebase.5.pod:583
msgid ""
"Only anchor merges have the C<[git-debrebase anchor: ...]> tag.  Single-"
"parent anchors are not generated by git-debrebase, and when made manually "
"should not contain any C<[git-debrebase ...]> annotation."
msgstr ""
"Only anchor merges have the C<[git-debrebase anchor: ...]> tag.  Single-"
"parent anchors are not generated by git-debrebase, and when made manually "
"should not contain any C<[git-debrebase ...]> annotation."

#. type: textblock
#: ../git-debrebase.5.pod:588
msgid ""
"The C<split mixed commit> and C<convert dgit import> tags are added to the "
"pre-existing commit message, when git-debrebase rewrites the commit."
msgstr ""
"The C<split mixed commit> and C<convert dgit import> tags are added to the "
"pre-existing commit message, when git-debrebase rewrites the commit."

#. type: =head1
#: ../git-debrebase.5.pod:592
msgid "APPENDIX - DGIT IMPORT HANDLING"
msgstr "APPENDIX - DGIT IMPORT HANDLING"

#. type: textblock
#: ../git-debrebase.5.pod:594
msgid ""
"The dgit .dsc import format is not documented or specified (so some of the "
"following terms are not defined anywhere).  The dgit import format it is "
"defined by the implementation in dgit, of which git-debrebase has special "
"knowledge."
msgstr ""
"The dgit .dsc import format is not documented or specified (so some of the "
"following terms are not defined anywhere).  The dgit import format it is "
"defined by the implementation in dgit, of which git-debrebase has special "
"knowledge."

#. type: textblock
#: ../git-debrebase.5.pod:599
msgid "Consider a non-dgit NMU followed by a dgit NMU:"
msgstr "Consider a non-dgit NMU followed by a dgit NMU:"

#. type: verbatim
#: ../git-debrebase.5.pod:601
#, no-wrap
msgid ""
"            interchange --/--B3!--%--//----D*-->\n"
"                         /          /\n"
"                        %          4\n"
"                       /          3\n"
"                      /          2\n"
"                     /          1\n"
"                    2          &_\n"
"                   /          /| \\\n"
"                  1          0 00 =XBC%\n"
"                 /\n"
"                /\n"
"          --@--A     breakwater\n"
"           /\n"
"        --#--------> upstream\n"
"\n"
msgstr ""
"            interchange --/--B3!--%--//----D*-->\n"
"                         /          /\n"
"                        %          4\n"
"                       /          3\n"
"                      /          2\n"
"                     /          1\n"
"                    2          &_\n"
"                   /          /| \\\n"
"                  1          0 00 =XBC%\n"
"                 /\n"
"                /\n"
"          --@--A     breakwater\n"
"           /\n"
"        --#--------> upstream\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:617
#, no-wrap
msgid ""
" Supplementary key:\n"
"\n"
msgstr ""
" Supplementary key:\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:619
#, no-wrap
msgid ""
"    =XBC%     dgit tarball import of .debian.tar.gz containing\n"
"               Debian packaging including changes B C and quilt patches\n"
"    0         dgit tarball import of upstream tarball\n"
"    00        dgit tarball import of supplementary upstream piece\n"
"    &_        dgit import nearly-breakwater-anchor\n"
"    //        dgit fetch / import-dsc pseudomerge to make fast forward\n"
"\n"
msgstr ""
"    =XBC%     dgit tarball import of .debian.tar.gz containing\n"
"               Debian packaging including changes B C and quilt patches\n"
"    0         dgit tarball import of upstream tarball\n"
"    00        dgit tarball import of supplementary upstream piece\n"
"    &_        dgit import nearly-breakwater-anchor\n"
"    //        dgit fetch / import-dsc pseudomerge to make fast forward\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:626
#, no-wrap
msgid ""
"    &'        git-debrebase converted import (upstream files only)\n"
"    C'        git-debrebase converted packaging change import\n"
"\n"
msgstr ""
"    &'        git-debrebase converted import (upstream files only)\n"
"    C'        git-debrebase converted packaging change import\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:629
#, no-wrap
msgid ""
"    * **      before and after HEAD\n"
"\n"
msgstr ""
"    * **      before and after HEAD\n"
"\n"

#. type: textblock
#: ../git-debrebase.5.pod:631
msgid "We want to transform this into:"
msgstr "We want to transform this into:"

#. type: =item
#: ../git-debrebase.5.pod:635
msgid "I. No new upstream version"
msgstr "I. No new upstream version"

#. type: verbatim
#: ../git-debrebase.5.pod:637
#, no-wrap
msgid ""
" (0 + 00 eq #)\n"
"                        --/--B3!--%--//-----D*-------------/-->\n"
"                         /          /                     /\n"
"                        %          4                     4**\n"
"                       /          3                     3\n"
"                      /          2                     2\n"
"                     /          1                     1\n"
"                    2          &_                    /\n"
"                   /          /| \\                  /\n"
"                  1          0 00 =XBC%            /\n"
"                 /                                /\n"
"                /                                /\n"
"          --@--A-----B---------------------C'---D\n"
"           /\n"
"        --#----------------------------------------->\n"
"\n"
msgstr ""
" (0 + 00 eq #)\n"
"                        --/--B3!--%--//-----D*-------------/-->\n"
"                         /          /                     /\n"
"                        %          4                     4**\n"
"                       /          3                     3\n"
"                      /          2                     2\n"
"                     /          1                     1\n"
"                    2          &_                    /\n"
"                   /          /| \\                  /\n"
"                  1          0 00 =XBC%            /\n"
"                 /                                /\n"
"                /                                /\n"
"          --@--A-----B---------------------C'---D\n"
"           /\n"
"        --#----------------------------------------->\n"
"\n"

#. type: =item
#: ../git-debrebase.5.pod:653
msgid "II. New upstream"
msgstr "II. New upstream"

#. type: verbatim
#: ../git-debrebase.5.pod:655
#, no-wrap
msgid ""
" (0 + 00 neq #)\n"
"\n"
msgstr ""
" (0 + 00 neq #)\n"
"\n"

#. type: verbatim
#: ../git-debrebase.5.pod:657
#, no-wrap
msgid ""
"                        --/--B3!--%--//-----D*-------------/-->\n"
"                         /          /                     /\n"
"                        %          4                     4**\n"
"                       /          3                     3\n"
"                      /          2                     2\n"
"                     /          1                     1\n"
"                    2          &_                    /\n"
"                   /          /| \\                  /\n"
"                  1          0 00 =XBC%            /\n"
"                 /                                /\n"
"                /                                /\n"
"          --@--A-----B-----------------@---C'---D\n"
"           /                          /\n"
"        --#--------------------- - - / - - --------->\n"
"                                    /\n"
"                                   &'\n"
"                                  /|\n"
"                                 0 00\n"
"\n"
msgstr ""
"                        --/--B3!--%--//-----D*-------------/-->\n"
"                         /          /                     /\n"
"                        %          4                     4**\n"
"                       /          3                     3\n"
"                      /          2                     2\n"
"                     /          1                     1\n"
"                    2          &_                    /\n"
"                   /          /| \\                  /\n"
"                  1          0 00 =XBC%            /\n"
"                 /                                /\n"
"                /                                /\n"
"          --@--A-----B-----------------@---C'---D\n"
"           /                          /\n"
"        --#--------------------- - - / - - --------->\n"
"                                    /\n"
"                                   &'\n"
"                                  /|\n"
"                                 0 00\n"
"\n"

#. type: textblock
#: ../git-debrebase.5.pod:680
msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1)"
msgstr "git-debrebase(1), dgit-maint-rebase(7), dgit(1)"