# 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-08-15 11:11+0100\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 ../git-deborig.1.pod:1 ../tag2upload.5.pod:1
#, no-wrap
msgid "NAME"
msgstr ""

#. type: =head1
#: ../dgit.1:1890 ../dgit.7:23 ../dgit-user.7.pod:446
#: ../dgit-nmu-simple.7.pod:158 ../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:341 ../git-deborig.1.pod:60 ../tag2upload.5.pod:307
#, 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: =head1
#: ../dgit-maint-merge.7.pod:513 ../dgit-maint-gbp.7.pod:143
#: ../dgit-maint-debrebase.7.pod:796 ../dgit-maint-bpo.7.pod:144
#: ../git-debpush.1.pod:346 ../git-deborig.1.pod:64
msgid "AUTHOR"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:3
msgid "dgit - tips for maintaining official Debian backports"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:7
msgid ""
"This document describes elements of a workflow for using B<dgit> to maintain "
"an official Debian backport.  We do not assume that whoever uploads the "
"package to Debian unstable is using B<dgit>."
msgstr ""

#. type: =head1
#: ../dgit-maint-bpo.7.pod:11
msgid "GENERAL TIPS"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:13
msgid ""
"The first time a package is backported for any particular Debian release, "
"you will have to pass the --new option to dgit."
msgstr ""

#. type: =head1
#: ../dgit-maint-bpo.7.pod:17 ../git-debrebase.5.pod:37
msgid "TERMINOLOGY"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:19
msgid ""
"Let the I<master> branch contain the packaging history uploaded to Debian "
"unstable, and the I<bookworm-bpo> branch be where you prepare your uploads "
"to the B<bookworm-backports> suite."
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:23
msgid ""
"A B<merging> backports workflow means that each time an upload migrates to "
"Debian testing and you want to prepare an upload to B<bookworm-backports>, "
"you do something like this:"
msgstr ""

#. type: verbatim
#: ../dgit-maint-bpo.7.pod:29
#, no-wrap
msgid ""
"    % git checkout bookworm-bpo\n"
"    % git merge master\n"
"    % dch --bpo\n"
"    % # any other changes needed for backporting\n"
"    % git commit -a\n"
"    % # try a build\n"
"\n"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:38
msgid ""
"A B<rebasing> backports workflow means that you throw away the history of "
"the I<bookworm-bpo> branch each time a new version migrates to Debian "
"testing, something equivalent to this:"
msgstr ""

#. type: verbatim
#: ../dgit-maint-bpo.7.pod:44
#, no-wrap
msgid ""
"    % git checkout -B bookworm-bpo master\n"
"    % dch --bpo\n"
"    % # any other changes needed for backporting\n"
"    % git commit -a\n"
"    % # try a build\n"
"\n"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:52
msgid ""
"If you use a merging backports workflow, your changelog contains entries for "
"each previous upload to B<bookworm-backports>; in a rebasing workflow, it "
"contains only the latest."
msgstr ""

#. type: =head1
#: ../dgit-maint-bpo.7.pod:56
msgid "CHOOSING BETWEEN THE TWO WORKFLOWS"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:58
msgid ""
"If backporting involves making no (additional) changes to the upstream "
"source, whether you use a merging or rebasing backports workflow is a matter "
"of personal preference.  There are good arguments in favour of both "
"workflows fitting the semantics of the B<*-backports> suites."
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:63
msgid ""
"If you have to make changes to the upstream source to make the package work "
"on machines running Debian stable, it is advisable to choose a rebasing "
"workflow.  This ensures that dgit can automatically update the debian/"
"patches directory without any manual intervention."
msgstr ""

#. type: =head1
#: ../dgit-maint-bpo.7.pod:68
msgid "TIPS FOR A MERGING WORKFLOW"
msgstr ""

#. type: =head2
#: ../dgit-maint-bpo.7.pod:70 ../dgit-maint-bpo.7.pod:97
msgid "Use dgit's branches"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:72
msgid ""
"If you do not yourself upload the package to Debian unstable, it is usually "
"easiest to use dgit's branches, and ignore the configured Vcs-Git repository."
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:76
msgid "You would use"
msgstr ""

#. type: verbatim
#: ../dgit-maint-bpo.7.pod:80
#, no-wrap
msgid ""
"    % dgit clone foo bookworm\n"
"\n"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:84
msgid "for a new backport of package 'foo' to B<bookworm-backports>, and then"
msgstr ""

#. type: verbatim
#: ../dgit-maint-bpo.7.pod:88
#, no-wrap
msgid ""
"    % dgit fetch bookworm\n"
"    % git merge dgit/dgit/bookworm\n"
"\n"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:93
msgid "when new versions migrate to Debian testing."
msgstr ""

#. type: =head1
#: ../dgit-maint-bpo.7.pod:95
msgid "TIPS FOR A REBASING WORKFLOW"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:99
msgid ""
"If you do not yourself upload the package to Debian unstable, it is usually "
"easiest to use dgit's branches, and ignore the configured Vcs-Git "
"repository.  For each new version from Debian testing, you would"
msgstr ""

#. type: verbatim
#: ../dgit-maint-bpo.7.pod:106
#, no-wrap
msgid ""
"    % dgit fetch bookworm\n"
"    % git checkout -B bookworm-bpo dgit/dgit/bookworm\n"
"    % # use git-cherry-pick(1) to (re)apply any needed backporting fixes\n"
"\n"
msgstr ""

#. type: =head2
#: ../dgit-maint-bpo.7.pod:112
msgid "Overwriting"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:114
msgid ""
"B<dgit push> tries hard to prevent you from accidentally overwriting uploads "
"that it thinks aren't represented in the git history you are trying to "
"upload.  This is mainly to prevent accidentally overwriting NMUs."
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:119
msgid ""
"With a rebasing backports workflow, dgit will think that every upload of a "
"new version from Debian testing might be accidentally overwriting uploads.  "
"You will need to explicitly indicate the upload to B<bookworm-backports> you "
"wish to overwrite."
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:124
msgid ""
"Suppose that the last upload to B<bookworm-backports> was versioned "
"I<1.2.2-1~bpo10+1> and you have now prepared I<1.2.3-1~bpo10+1> for upload.  "
"When you B<dgit push>, you will need to pass I<--trust-"
"changelog=1.2.2-1~bpo10+1>."
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:129
msgid ""
"Alternatively, you can perform the pseudomerge that I<--trust-changelog> "
"would have done yourself:"
msgstr ""

#. type: verbatim
#: ../dgit-maint-bpo.7.pod:134
#, no-wrap
msgid ""
"    % dgit fetch bookworm-backports\n"
"    % git merge -s ours dgit/dgit/bookworm-backports\n"
"    % dgit push-source\n"
"\n"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:142
msgid "dgit(1), dgit(7), https://backports.debian.org/"
msgstr ""

#. type: textblock
#: ../dgit-maint-bpo.7.pod:146
msgid ""
"This manpage was written and is maintained by Sean Whitton "
"<spwhitton@spwhitton.name>."
msgstr ""