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
|
# SOME DESCRIPTIVE TITLE
# Copyright (C) YEAR Free Software Foundation, Inc.
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2025-03-28 17:38+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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
#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
#: ../git-debpush.1.pod:1 ../tag2upload.5.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
#: ../dgit.1:1826 ../dgit.7:23 ../dgit-user.7.pod:463
#: ../dgit-nmu-simple.7.pod:137 ../dgit-maint-native.7.pod:125
#: ../dgit-maint-merge.7.pod:509 ../dgit-maint-gbp.7.pod:139
#: ../dgit-maint-debrebase.7.pod:792 ../dgit-downstream-dsc.7.pod:352
#: ../dgit-sponsorship.7.pod:326 ../dgit-maint-bpo.7.pod:140
#: ../git-debrebase.1.pod:629 ../git-debrebase.5.pod:677
#: ../git-debpush.1.pod:272 ../tag2upload.5.pod:224
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. 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
#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5 ../tag2upload.5.pod:5
msgid "INTRODUCTION"
msgstr ""
#. type: textblock
#: ../dgit-user.7.pod:465 ../dgit-maint-native.7.pod:127
#: ../dgit-maint-gbp.7.pod:141
msgid "dgit(1), dgit(7)"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:3
msgid "dgit - tutorial for package maintainers of Debian-native packages"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:7
msgid ""
"This document describes elements of a workflow for using B<dgit> to maintain "
"a Debian package that uses one of the native source formats (\"1.0\" & \"3.0 "
"(native)\")."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:15
msgid "We expect that your git history is fast-forwarding."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:19
msgid ""
"You should be prepared to tolerate a small amount of ugliness in your git "
"history in the form of merges which stitch the dgit-generated archive view "
"into your maintainer history."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:25
msgid ""
"This is to handle uploads that were not made with dgit, such as the uploads "
"you made before switching to this workflow, or NMUs."
msgstr ""
#. type: =head2
#: ../dgit-maint-native.7.pod:31
msgid "Benefits"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:37 ../dgit-maint-gbp.7.pod:16
#: ../dgit-maint-debrebase.7.pod:38
msgid ""
"Benefit from dgit's safety catches. In particular, ensure that your upload "
"always matches exactly your git HEAD."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:42
msgid "Provide a better, more detailed history to downstream dgit users."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:48
msgid "Incorporate an NMU with one command."
msgstr ""
#. type: =head1
#: ../dgit-maint-native.7.pod:52
msgid "FIRST PUSH WITH DGIT"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:54
msgid "You do not need to do anything special to your tree to push with dgit."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:57
msgid "Simply prepare your git tree in the usual way, and then:"
msgstr ""
#. type: verbatim
#: ../dgit-maint-native.7.pod:61
#, no-wrap
msgid ""
" % dgit -wgf --trust-changelog push-source\n"
"\n"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:65
msgid "(Do not make any tags yourself: dgit push will do that.)"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:67
msgid ""
"You may use B<dgit pbuilder> or B<dgit cowbuilder> instead of B<dgit "
"sbuild>; see dgit(1) for the syntax of those subcommands."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:71
msgid ""
"The --trust-changelog option tells dgit that you are expecting that your git "
"history is not a descendant of the history which dgit synthesised from the "
"previous non-dgit uploads."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:76
msgid ""
"dgit will make a merge commit on your branch but without making any code "
"changes (ie, a pseudo-merge) so that your history, which will be pushed to "
"the dgit git server, is fast forward from the dgit archive view."
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:84
msgid ""
"Alternatively, if this was the first ever dgit push of the package to this "
"suite, you can avoid this merge commit by passing C<--deliberately-not-fast-"
"forward> instead of C<--trust-changelog>. This avoids introducing a new "
"origin commit into your git history."
msgstr ""
#. type: =head1
#: ../dgit-maint-native.7.pod:92
msgid "SUBSEQUENT PUSHES"
msgstr ""
#. type: verbatim
#: ../dgit-maint-native.7.pod:96
#, no-wrap
msgid ""
" % dgit -wgf push-source\n"
"\n"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:100 ../dgit-maint-native.7.pod:110
msgid "That's it."
msgstr ""
#. type: =head1
#: ../dgit-maint-native.7.pod:102
msgid "INCORPORATING AN NMU"
msgstr ""
#. type: verbatim
#: ../dgit-maint-native.7.pod:106 ../dgit-maint-merge.7.pod:502
#, no-wrap
msgid ""
" % dgit pull\n"
"\n"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:112
msgid "Or, if you would prefer to review the changes, you can do this:"
msgstr ""
#. type: verbatim
#: ../dgit-maint-native.7.pod:117
#, no-wrap
msgid ""
" % dgit fetch\n"
" % dgit diff HEAD..dgit/dgit/sid\n"
"\n"
msgstr ""
#. type: textblock
#: ../dgit-maint-native.7.pod:122
msgid ""
"If you do not merge the NMU into your own git history, the next push will "
"then require I<--trust-changelog>."
msgstr ""
|