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 #: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128
50 #: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138
51 msgid "dgit(1), dgit(7)"
55 #: ../dgit-maint-native.7.pod:3
56 msgid "dgit - tutorial for package maintainers of Debian-native packages"
60 #: ../dgit-maint-native.7.pod:7
62 "This document describes elements of a workflow for using B<dgit> to maintain "
63 "a Debian package that uses one of the native source formats (\"1.0\" & \"3.0 "
68 #: ../dgit-maint-native.7.pod:15
69 msgid "We expect that your git history is fast-forwarding."
73 #: ../dgit-maint-native.7.pod:19
75 "You should be prepared to tolerate a small amount of ugliness in your git "
76 "history in the form of merges which stitch the dgit-generated archive view "
77 "into your maintainer history."
81 #: ../dgit-maint-native.7.pod:25
83 "This is to handle uploads that were not made with dgit, such as the uploads "
84 "you made before switching to this workflow, or NMUs."
88 #: ../dgit-maint-native.7.pod:31
93 #: ../dgit-maint-native.7.pod:37 ../dgit-maint-gbp.7.pod:16
94 #: ../dgit-maint-debrebase.7.pod:38
96 "Benefit from dgit's safety catches. In particular, ensure that your upload "
97 "always matches exactly your git HEAD."
101 #: ../dgit-maint-native.7.pod:42
102 msgid "Provide a better, more detailed history to downstream dgit users."
106 #: ../dgit-maint-native.7.pod:48
107 msgid "Incorporate an NMU with one command."
111 #: ../dgit-maint-native.7.pod:52
112 msgid "FIRST PUSH WITH DGIT"
116 #: ../dgit-maint-native.7.pod:54
117 msgid "You do not need to do anything special to your tree to push with dgit."
121 #: ../dgit-maint-native.7.pod:57
122 msgid "Simply prepare your git tree in the usual way, and then:"
126 #: ../dgit-maint-native.7.pod:61
129 " % dgit -wgf sbuild -A -c sid\n"
130 " % dgit -wgf --overwrite push\n"
135 #: ../dgit-maint-native.7.pod:66
136 msgid "(Do not make any tags yourself: dgit push will do that.)"
140 #: ../dgit-maint-native.7.pod:68
142 "You may use B<dgit pbuilder> or B<dgit cowbuilder> instead of B<dgit "
143 "sbuild>; see dgit(1) for the syntax of those subcommands."
147 #: ../dgit-maint-native.7.pod:72
149 "The --overwrite option tells dgit that you are expecting that your git "
150 "history is not a descendant of the history which dgit synthesised from the "
151 "previous non-dgit uploads."
155 #: ../dgit-maint-native.7.pod:77
157 "dgit will make a merge commit on your branch but without making any code "
158 "changes (ie, a pseudo-merge) so that your history, which will be pushed to "
159 "the dgit git server, is fast forward from the dgit archive view."
163 #: ../dgit-maint-native.7.pod:85
165 "Alternatively, if this was the first ever dgit push of the package, you can "
166 "avoid this merge commit by passing C<--deliberately-not-fast-forward>. "
167 "instead of C<--overwrite>. This avoids introducing a new origin commit into "
172 #: ../dgit-maint-native.7.pod:93
173 msgid "SUBSEQUENT PUSHES"
177 #: ../dgit-maint-native.7.pod:97
180 " % dgit -wgf push\n"
185 #: ../dgit-maint-native.7.pod:101 ../dgit-maint-native.7.pod:111
190 #: ../dgit-maint-native.7.pod:103
191 msgid "INCORPORATING AN NMU"
195 #: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484
203 #: ../dgit-maint-native.7.pod:113
204 msgid "Or, if you would prefer to review the changes, you can do this:"
208 #: ../dgit-maint-native.7.pod:118
212 " % dgit diff HEAD..dgit/dgit/sid\n"
217 #: ../dgit-maint-native.7.pod:123
219 "If you do not merge the NMU into your own git history, the next push will "
220 "then require I<--overwrite>."