summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--Debian/Dgit.pm59
-rw-r--r--HACKING91
-rw-r--r--Makefile8
-rw-r--r--debian/changelog124
-rw-r--r--debian/control10
-rw-r--r--debian/copyright4
-rw-r--r--debian/git-debpush.install1
-rwxr-xr-xdebian/rules10
-rw-r--r--debian/tests/control20
-rwxr-xr-xdgit196
-rw-r--r--dgit-maint-bpo.7.pod141
-rw-r--r--dgit.110
-rwxr-xr-xgit-debpush297
-rw-r--r--git-debpush.1.pod75
-rwxr-xr-xgit-debrebase4
-rw-r--r--git-debrebase.1.pod30
-rw-r--r--git-debrebase.5.pod2
-rwxr-xr-xgit-playtree-setup48
-rwxr-xr-xinfra/dgit-repos-policy-debian2
-rwxr-xr-xinfra/dgit-repos-server14
-rw-r--r--po/en_US.po1518
-rw-r--r--po/messages.pot1541
-rw-r--r--po/nl.po2041
-rw-r--r--po4a/dgit-maint-debrebase_7.pot387
-rw-r--r--po4a/dgit-maint-merge_7.pot258
-rw-r--r--po4a/dgit_1.pot677
-rw-r--r--po4a/dgit_7.pot102
-rw-r--r--po4a/git-debrebase_1.pot377
-rw-r--r--po4a/git-debrebase_5.pot40
-rw-r--r--po4a/po4a.cfg1
-rwxr-xr-xtests/enumerate-tests29
-rw-r--r--tests/git-srcs/pari-extra_3-1.git.tarbin51200 -> 40960 bytes
-rwxr-xr-xtests/http-static-server96
-rw-r--r--tests/lib38
-rw-r--r--tests/lib-baredebian18
-rw-r--r--tests/lib-build-modes1
-rw-r--r--tests/lib-core3
-rw-r--r--tests/lib-gdr12
-rwxr-xr-xtests/setup/examplegit4
-rwxr-xr-xtests/setup/gbp48
-rwxr-xr-xtests/setup/http-git-check15
-rwxr-xr-xtests/tests/alternating-dgit25
-rwxr-xr-xtests/tests/clone-gitnosuite2
-rwxr-xr-xtests/tests/clone-nogit2
-rwxr-xr-xtests/tests/fetch-somegit-notlast2
-rwxr-xr-xtests/tests/forcesplit-overwrite3
-rwxr-xr-xtests/tests/ftpmasterapi-http19
-rwxr-xr-xtests/tests/gbp-orig42
-rwxr-xr-xtests/tests/gdr-import-dgit1
-rwxr-xr-xtests/tests/tagupl33
-rwxr-xr-xtests/tests/tagupl-baredebian38
-rwxr-xr-xtests/tests/tagupl-gbp28
-rwxr-xr-xtests/tests/tagupl-native1
54 files changed, 4584 insertions, 3965 deletions
diff --git a/.gitignore b/.gitignore
index a5e13ea..6e87a61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,6 +16,7 @@ dgit-maint-native.7
dgit-maint-merge.7
dgit-maint-gbp.7
dgit-maint-debrebase.7
+dgit-maint-bpo.7
dgit-sponsorship.7
dgit-downstream-dsc.7
git-debrebase.1
diff --git a/Debian/Dgit.pm b/Debian/Dgit.pm
index 348f608..3ac042c 100644
--- a/Debian/Dgit.pm
+++ b/Debian/Dgit.pm
@@ -2,7 +2,7 @@
# dgit
# Debian::Dgit: functions common to dgit and its helpers and servers
#
-# Copyright (C) 2015-2016 Ian Jackson
+# Copyright (C) 2015-2019 Ian Jackson
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@ use Config;
use Digest::SHA;
use Data::Dumper;
use IPC::Open2;
-use File::Path;
+use File::Path qw(:DEFAULT make_path);
use File::Basename;
use Dpkg::Control::Hash;
use Debian::Dgit::ExitStatus;
@@ -51,10 +51,12 @@ BEGIN {
server_branch server_ref
stat_exists link_ltarget rename_link_xf
hashfile
- fail failmsg ensuredir must_getcwd executable_on_path
+ fail failmsg ensuredir ensurepath
+ must_getcwd executable_on_path
waitstatusmsg failedcmd_waitstatus
failedcmd_report_cmd failedcmd
runcmd shell_cmd cmdoutput cmdoutput_errok
+ @git
git_rev_parse changedir_git_toplevel git_cat_file
git_get_ref git_get_symref git_for_each_ref
git_for_each_tag_referring is_fast_fwd
@@ -112,6 +114,8 @@ our $gdrlast_refprefix = 'debrebase-last';
our $printdebug_when_debuglevel = 1;
our $debugcmd_when_debuglevel = 1;
+our (@git) = qw(git);
+
# these three all go together, only valid after record_maindir
our $maindir;
our $maindir_gitdir;
@@ -218,9 +222,7 @@ sub shellquote {
sub printcmd {
my $fh = shift @_;
my $intro = shift @_;
- print $fh $intro," " or confess "$!";
- print $fh shellquote @_ or confess "$!";
- print $fh "\n" or confess "$!";
+ print $fh $intro." ".(join '', shellquote @_)."\n" or confess "$!";
}
sub debugcmd {
@@ -309,6 +311,12 @@ sub ensuredir ($) {
confess "mkdir $dir: $!";
}
+sub ensurepath ($$) {
+ my ($firsttocreate, $subdir) = @_; # creates necessary bits of $subidr
+ ensuredir $firsttocreate;
+ make_path "$firsttocreate/$subdir";
+}
+
sub must_getcwd () {
my $d = getcwd();
defined $d or fail f_ "getcwd failed: %s\n", $!;
@@ -649,7 +657,10 @@ sub resolve_upstream_version ($$) {
}
$used = $tried[-1];
$message = f_ 'using upstream from git tag %s', $used;
- }
+ } elsif ($new_upstream =~ m{^refs/tags/($versiontag_re)$}s) {
+ $message = f_ 'using upstream from git tag %s', $1;
+ $used = $1;
+ }
$new_upstream = git_rev_parse $new_upstream;
return ($new_upstream, $used, $message);
@@ -882,7 +893,7 @@ sub reflog_cache_insert ($$$) {
# When we no longer need to support squeeze, use --create-reflog
# instead of this:
my $parent = $ref; $parent =~ s{/[^/]+$}{};
- ensuredir "$maindir_gitcommon/logs/$parent";
+ ensurepath "$maindir_gitcommon/logs", "$parent";
my $makelogfh = new IO::File "$maindir_gitcommon/logs/$ref", '>>'
or confess "$!";
@@ -976,7 +987,7 @@ sub reflog_cache_lookup ($$) {
# changedir playground
# changedir $maindir
#
-# playtree_setup $local_git_cfg
+# playtree_setup
# # ^ call in some (perhaps trivial) subdir of playground
#
# rmtree playground
@@ -1035,28 +1046,28 @@ sub fresh_playground ($) {
# ----- playtrees -----
-sub playtree_setup (;$) {
- my ($t_local_git_cfg) = @_;
- $t_local_git_cfg //= $local_git_cfg;
+sub playtree_setup () {
# for use in the playtree
# $maindir must be set, eg by calling record_maindir or fresh_playground
- runcmd qw(git init -q);
- runcmd qw(git config gc.auto 0);
- foreach my $copy (qw(user.email user.name user.useConfigOnly
- core.sharedRepository
- core.compression core.looseCompression
- core.bigFileThreshold core.fsyncObjectFiles)) {
- my $v = $t_local_git_cfg->{$copy};
- next unless $v;
- runcmd qw(git config), $copy, $_ foreach @$v;
- }
# this is confusing: we have
# . playtree, not a worktree, has .git/, our cwd
# $maindir might be a worktree so
# $maindir_gitdir contains our main working "dgit", HEAD, etc.
# $maindir_gitcommon the shared stuff, including .objects
- rmtree('.git/objects');
- symlink "$maindir_gitcommon/objects",'.git/objects' or confess "$!";
+
+ # we need to invoke git-playtree-setup via git because
+ # there may be config options it needs which are only available
+ # to us, sensibly, in @git
+
+ # And, we look for it in @INC too. This is a bit perverse.
+ # We do this because in the Debian packages we want to have
+ # a copy of this script in each binary package, rather than
+ # making yet another .deb or tangling the dependencies.
+ # @INC is conveniently available.
+ my $newpath = join ':', +(grep { !m/:/ } @INC),
+ '/usr/share/dgit', $ENV{PATH};
+ runcmd qw(env), "PATH=$newpath", @git, qw(playtree-setup .);
+
ensuredir '.git/info';
open GA, "> .git/info/attributes" or confess "$!";
print GA "* $negate_harmful_gitattrs\n" or confess "$!";
diff --git a/HACKING b/HACKING
new file mode 100644
index 0000000..2839200
--- /dev/null
+++ b/HACKING
@@ -0,0 +1,91 @@
+Here are some hints and tips or working on src:dgit
+===================================================
+
+Program and source code layout
+------------------------------
+
+Most stuff is in the toplevel.
+Debian/ contains Perl modules, notably Debian/Dgit.pm.
+That module contains much shared code and is used by every package.
+
+The test suite is very useful for ad-hoc work, so see "Tests" below.
+
+Coding style
+------------
+
+I like to use perl "poetry mode" where ( ) are often elided.
+This is often nice and terse but there is a gotcha. This
+ some_function ($a + 2), $b, $c
+is wrong, because the ( ) are treated as function call ( )
+for some_function. When this is a risk, you have to write:
+ some_function +($a + 2), $b, $c
+
+Keep the line length to 75 at most please.
+
+i18n
+----
+
+In the Perl code we use these functions:
+
+ here: meaning: like, in C:
+ __ translate this message _ aka gettext
+ f_ this is a sprintf string to be translated sprintf(_ ...
+ i_ mark for translation but do not translate here gettext_noop
+
+See the info node `(gettext) Sources' for the complete semantics.
+
+The shell scripts are not translated right now.
+
+Running ad-hoc
+--------------
+
+You can run everything right out of the git tree, for ad hoc testing,,
+like this (supposing your dgit tree is in things/Dgit/dgit):
+
+ ~/things/Dgit/dgit/using-these dgit --some-option blah blah
+
+using-these will set PATH and PERLLIB so that programs and modules
+come from its own directory (obtained from $0).
+
+Tests, running and use for hacking
+----------------------------------
+
+The test cases are in bash and are in tests/tests/*. They all use
+shell libraries tests/lib*.
+
+You can run it formally with autopkgtest, but you normally want to run
+tests in one of these two ways [1]:
+
+ tests/using-intree tests/tests/<some-test> 2>&1 |tee ../log
+ tests/run-all [tests/tests/<some shell glob>]
+
+These will leave their working stuff in ./tests/tmp/<name-of-test>.
+
+The test suite is often a nice way to set up situations for ad-hoc
+testing. You can add "xxx" in the middle of one of the test cases to
+get it to crash at the right point. Have an absolute cd like
+ cd ~/things/Dgit/dgit/tests/tmp/<some-test>
+in your shell history, because each time you run the test it will
+blow that directory away again.
+
+There are many env vars settings like
+ DGIT_TEST_DEBUG= DGIT_TEST_DEBUG=-DDD
+ DGIT_TEST_DEBPUSH_DEBUG= DGIT_TEST_DEBPUSH_DEBUG=x
+which can be used to control the level of debug output from
+individual programs run by the test suite.
+
+Editing/adding tests
+--------------------
+
+Things in tests/setup/ generate canned starting points. You can run
+them by hand, but when they are imported by other tests they are not
+automatically regenerated by default. So if you are editing one of
+those, git-clean is your friend.
+
+debian/tests/control is autogenerated by a rule in debia/rules. If
+making actual releases, you must rerun that.
+
+[1] The test suite and libraries, when run without any special
+environment variables, expect to be run via DEP-8 (autopkgtest) - so
+they want an to everything out of PATH and /usr. But there are also
+arrangements to honour environment variables set by using-intree.
diff --git a/Makefile b/Makefile
index 380bdb0..c4f1673 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
# dgit
# Integration between git and Debian-style archives
#
-# Copyright (C)2013-2016 Ian Jackson
+# Copyright (C)2013-2018 Ian Jackson
+# Copyright (C)2019 Sean Whitton
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -33,7 +34,7 @@ infraexamplesdir=$(prefix)/share/doc/dgit-infrastructure/examples
txtdocdir=$(prefix)/share/doc/dgit
absurddir=$(prefix)/share/dgit/absurd
-PROGRAMS=dgit dgit-badcommit-fixup
+PROGRAMS=dgit dgit-badcommit-fixup git-playtree-setup
MAN1PAGES=dgit.1
MAN7PAGES=dgit.7 \
@@ -42,7 +43,8 @@ MAN7PAGES=dgit.7 \
dgit-maint-merge.7 dgit-maint-gbp.7 \
dgit-maint-debrebase.7 \
dgit-downstream-dsc.7 \
- dgit-sponsorship.7
+ dgit-sponsorship.7 \
+ dgit-maint-bpo.7
TXTDOCS=README.dsc-import
PERLMODULES= \
diff --git a/debian/changelog b/debian/changelog
index c5b898f..742d92f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,126 @@
-dgit (9.2~) unstable; urgency=medium
+dgit (9.7) unstable; urgency=medium
- *
+ dgit general bugfixes:
+ * Correctly test for presence of git repo on dgit git server.
+ Fixes behaviour following mixed dgit/non-dgit uploads. Closes:#934126.
+ (Was badly broken by http fetching rework in dgit 9.6.)
+ * Fix use on NFS, by closing a file which is going to be deleted.
+ [Report and fix from Stéphane Glondu] Closes:#933827.
- --
+ dgit vcs-git bugfixes:
+ * Strip [<path>] (used eg by Debian Haskell Team). Closes:#932699.
+ * update-vcs-git: Cope if url is unchanged.
+ * update-vcs-git: Strip -b (as it always should have done).
+
+ Test suite:
+ * New facilities for http testing, including mock webservers.
+ * New test cases for http, and for bugs fixed in this version.
+ * Switch to using http git check in three existing tests.
+ * Improve debian/tests/control generator.
+ * Limited refactoring to support other changes.
+
+ Other minor changes:
+ * dgit: Slightly more debugging for check_for_git with http[s]
+ * changelog: Fix a typo in the entry for 9.6.
+ * i18n (messages) updated, following message changes.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sun, 11 Aug 2019 01:11:01 +0100
+
+dgit (9.6) unstable; urgency=medium
+
+ * git-playtree-setup had a spurious set -x so many programs spewed
+ debugging output. This is now fixed. Closes:#932959.
+
+ dgit:
+ * Drop support for configuring old, not currently enabled, methods
+ of TLS key/cert pinning. We are going to revisit this soon.
+ * Provide a --for-push option (useful in for certain special users).
+ * Reduce variety in HTTP clients we use. Specifically, use WWW::Curl
+ for accessing (i) the ftpmaster API, (ii) the http dgit git server
+ mirror (iii) downloading the .dsc.
+
+ Administrivia:
+ * Add missing Closes of #932476 to changelog entry for 9.5
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 25 Jul 2019 13:12:08 +0100
+
+dgit (9.5) unstable; urgency=medium
+
+ git-debpush [Sean Whitton]:
+ * Support ignoring individual checks with --force=check. Closes:#932459.
+ * Check upstream source is identical in the upstream tag. Closes:#932476.
+ * Check that patches are (un)applicable. Closes:#932477.
+ * Check for an unstitched git-debrebase branch. Closes:#932612.
+ * Check for explicitly pushing detached HEAD.
+
+ dgit clone [Ian Jackson]:
+ * No longer create an "origin" remote. Closes:#932694.
+
+ Documentation:
+ * dgit-maint-bpo(7): new manpage for maintainers of official Debian
+ backports. Closes:#857490. [Sean Whitton]
+ * git-debrebase(1): make this manpage a less intimidating entry point.
+ Closes:#926656.
+ [Sean Whitton & Ian Jackson; prompted by feedback from Sam Hartman]
+
+ Miscellaneous:
+ * Correct the description of --force in git-debpush(1) [Sean Whitton].
+ * git-debrebase(*): fix some crossreferences [Sean Whitton].
+ Closes:#932536.
+ * Break out git-playtree-setup and rewrite in shell. [Ian Jackson]
+ * Fix organisation copyright attribution for Matthew Vernon's
+ contributions. Closes:#932630.
+ * HACKING: new document for helping people work on the code. [Ian Jackson]
+ * Update Vcs-Git etc. to point to salsa.
+
+ -- Sean Whitton <spwhitton@spwhitton.name> Mon, 22 Jul 2019 21:38:19 +0100
+
+dgit (9.4) unstable; urgency=medium
+
+ dgit:
+ * Support the Ubuntu Cloud Archive [Matthew Vernon]. Closes:#932322.
+
+ test suite:
+ * tag-to-upload tests: Tolerate a changed git message. Closes:#932475.
+
+ administrivia:
+ * debian/copyright: Add some missing credtis
+ * Update copyright notices in many files
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Sat, 20 Jul 2019 16:26:32 +0100
+
+dgit (9.3) unstable; urgency=medium
+
+ dgit and git-debrebase bugfixes:
+ * No longer crash if .git/logs does not exist when we need it.
+ * Report the upstream tag, rather than commit id, in tags/commits,
+ if the user explicitly specifies refs/tags/...
+
+ tag-to-upload, git-debpush [Sean Whitton]:
+ * Several new checks designed to prevent broken uploads.
+ - Including: Check that upstream tag is ancestor of branch to be tagged.
+ Closes:#932096
+ * Cope with spaces in user-supplied upstream tag.
+
+ tag-to-upload, server side:
+ * Fix non-default quilt modes. These were all previously broken.
+ * Arrange to report the upstream tag in dgit-generated commits/tags.
+
+ dgit archive query improvements [Matthew Vernon]:
+ * dgit(1): document the presence of the aptget method. Closes:#932321.
+
+ minor supporting changes:
+ * New tests tagupl-baredebian and tagupl-gbp.
+ * Tiny addition to debugging output and test suite output.
+ * Test suite rearrangements.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Thu, 18 Jul 2019 03:10:25 +0100
+
+dgit (9.2) unstable; urgency=medium
+
+ * No change upload to force rebuild on buildd.
+
+ -- Ian Jackson <ijackson@chiark.greenend.org.uk> Tue, 09 Jul 2019 22:01:25 +0100
dgit (9.1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 15c3cd4..3e82d8d 100644
--- a/debian/control
+++ b/debian/control
@@ -5,17 +5,17 @@ Maintainer: Ian Jackson <ijackson@chiark.greenend.org.uk>
Standards-Version: 3.9.4.0
Build-Depends: debhelper (>= 9), gettext, po4a, tcl
Testsuite: autopkgtest
-Vcs-Git: git://git.chiark.greenend.org.uk/~ianmdlvl/dgit.git
-Vcs-Browser: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git/dgit.git/
+Vcs-Git: https://salsa.debian.org/dgit-team/dgit
+Vcs-Browser: https://salsa.debian.org/dgit-team/dgit
Package: dgit
-Depends: perl, libwww-perl, libdpkg-perl, git-core, devscripts, dpkg-dev,
+Depends: perl, libdpkg-perl, git-core, devscripts, dpkg-dev,
${misc:Depends}, git-buildpackage, liblist-moreutils-perl,
liblocale-gettext-perl,
coreutils (>= 8.23-1~),
libdigest-sha-perl, dput, curl, apt,
libjson-perl, ca-certificates,
- libtext-iconv-perl, libtext-glob-perl
+ libtext-iconv-perl, libtext-glob-perl, libwww-curl-perl
Recommends: ssh-client
Suggests: sbuild | pbuilder | cowbuilder
Architecture: all
@@ -53,7 +53,7 @@ Description: client script for git pushing to Debian-style archives
Package: dgit-infrastructure
Depends: ${misc:Depends}, perl, git-core, gpgv, chiark-utils-bin,
libjson-perl, libdigest-sha-perl, libdbd-sqlite3-perl, sqlite3,
- libwww-perl, libdpkg-perl,
+ libdpkg-perl,
liblocale-gettext-perl
Recommends: dgit
Architecture: all
diff --git a/debian/copyright b/debian/copyright
index e4270c6..cb35198 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,8 +3,12 @@ Integration between git and Debian-style archives
Copyright (C)2013-2019 Ian Jackson
Copyright (C)2016-2019 Sean Whitton
+Copyright (C)2018-2019 Frans Spiesschaert
+Copyright (C)2019 Matthew Vernon / Genome Research Limited
+Copyright (C)2019 Paul Hardy
Copyright (C)1999-2010 Joey Hess
Copyright (C)2004-2010 Colin Watson
+Copyright (C)2004-2015 Best Practical Solutions, LLC
This program is free software: you can redistribute it and/or modify
diff --git a/debian/git-debpush.install b/debian/git-debpush.install
new file mode 100644
index 0000000..afba498
--- /dev/null
+++ b/debian/git-debpush.install
@@ -0,0 +1 @@
+git-playtree-setup /usr/share/git-debpush
diff --git a/debian/rules b/debian/rules
index ea2ceac..4d1a760 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
# dgit
# Integration between git and Debian-style archives
#
-# Copyright (C)2013-2016 Ian Jackson
+# Copyright (C)2013-2019 Ian Jackson
+# Copyright (C)2019 Sean Whitton
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -42,6 +43,7 @@ override_dh_auto_install: specpkg_install_gdp \
make install prefix=/usr DESTDIR=debian/dgit
make -C po install prefix=/usr DESTDIR=../debian/tmp \
SUPPRESS_PO_UPDATE=1 S=''
+ mv debian/dgit/usr/bin/git-playtree-setup debian/dgit/usr/share/dgit
make -C po4a install DESTDIR=../debian/tmp S=''
override_dh_missing:
@@ -63,6 +65,9 @@ specpkg_install_gdp: tok=gdp
specpkg_install_gdp: specperl=/usr/share/dgit/gdp/perl5
specpkg_install_gdp:
$(specpkg_install_common)
+ set -x; perl -i -pe 'next unless m/###substituted###/;' \
+ -e 's{^(git_playtree_setup)=.*}{$$1=/usr/share/$p/git-playtree-setup};' \
+ debian/$(p)/usr/bin/*
specpkg_install_%: tok=$*
specpkg_install_%: specperl=/usr/share/dgit/$(tok)/perl5
@@ -71,6 +76,8 @@ specpkg_install_%:
# # Most of the Perl modules in this package live in
# # $(specperl). The exception is Debian::Dgit::Infra, which
# # lives in $(globalperl) and adds $(specperl) to @INC.
+# # We also abuse this for git-playtree-setup. In .debs, this
+# # goes in the per-.deb @INC dir. See Dgit.pm::playtree_setup.
set -ex; \
base=debian/$(p); \
mod=Debian/Dgit/$(pm).pm; \
@@ -78,6 +85,7 @@ specpkg_install_%:
dst=$${base}$(globalperl)/$${mod}; \
mkdir -p $${dst%/*}; \
mv -f $$src $$dst; \
+ install -m 755 git-playtree-setup $${base}$(specperl); \
perl -i -p -e 'next unless m/###substituted###/;' \
-e 'next unless s/^# (?=unshift \@INC,)//;' \
-e 'die unless s{q\{\S+\}}{q{$(specperl)}};' \
diff --git a/debian/tests/control b/debian/tests/control
index 9bdce9d..731600b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -20,11 +20,19 @@ Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime
Restrictions: x-dgit-intree-only x-dgit-git-only
+Tests: alternating-dgit clone-gitnosuite clone-nogit drs-clone-nogit dsd-clone-nogit ftpmasterapi-http
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, libhttp-server-simple-static-perl
+
+Tests: gdr-import-dgit
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debrebase, git-buildpackage, libhttp-server-simple-static-perl
+
Tests: gdr-merge-conflicts
Tests-Directory: tests/tests
Depends: chiark-utils-bin, faketime, git-debrebase, git-buildpackage, quilt
-Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgit gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
+Tests: gdr-diverge-nmu gdr-diverge-nmu-dgit gdr-edits gdr-fresh gdr-import-dgitview gdr-import-nostitch gdr-makepatches7 gdr-merge gdr-subcommands gdr-unprocessable gdr-unprocessable-hints
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debrebase, git-buildpackage
@@ -68,6 +76,14 @@ Tests: tagupl
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl, git-debpush
+Tests: tagupl-baredebian
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, quilt, git-debpush, git-debrebase, git-buildpackage, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
+
+Tests: tagupl-gbp
+Tests-Directory: tests/tests
+Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debpush, libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl, libstring-shellquote-perl, libtry-tiny-perl
+
Tests: tagupl-native
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, git-debpush
@@ -80,7 +96,7 @@ Tests: trustingpolicy-replay
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, dput-ng
-Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-long build-modes-source checkout clone-clogsigpipe debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp debpolicy-taintrm defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-push-masterupdate drs-push-rejects dsd-divert fetch-localgitonly fetch-somegit-notlast forcesplit-linear forcesplit-overwrite gbp-orig gitconfig gitworktree import-dsc import-linkorigs import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush rpush-quilt sourceonlypolicy tag-updates unrepresentable version-opt
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime
diff --git a/dgit b/dgit
index 0d7c62d..941a14b 100755
--- a/dgit
+++ b/dgit
@@ -2,8 +2,9 @@
# dgit
# Integration between git and Debian-style archives
#
-# Copyright (C)2013-2018 Ian Jackson
-# Copyright (C)2017-2018 Sean Whitton
+# Copyright (C)2013-2019 Ian Jackson
+# Copyright (C)2017-2019 Sean Whitton
+# Copyright (C)2019 Matthew Vernon / Genome Research Limited
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -29,7 +30,7 @@ setup_sigwarn();
use IO::Handle;
use Data::Dumper;
-use LWP::UserAgent;
+use WWW::Curl::Easy;
use Dpkg::Control::Hash;
use File::Path;
use File::Spec;
@@ -53,6 +54,8 @@ use Debian::Dgit;
our $our_version = 'UNRELEASED'; ###substituted###
our $absurdity = undef; ###substituted###
+$SIG{INT} = 'DEFAULT'; # work around #932841
+
our @rpushprotovsn_support = qw(6 5 4); # Reverse order!
our $protovsn;
@@ -116,7 +119,6 @@ our $rewritemap = 'dgit-rewrite/map';
our @dpkg_source_ignores = qw(-i(?:^|/)\.git(?:/|$) -I.git);
-our (@git) = qw(git);
our (@dget) = qw(dget);
our (@curl) = (qw(curl --proto-redir), '-all,http,https', qw(-L));
our (@dput) = qw(dput);
@@ -637,20 +639,6 @@ sub progress {
our $ua;
-sub url_get {
- if (!$ua) {
- $ua = LWP::UserAgent->new();
- $ua->env_proxy;
- }
- my $what = $_[$#_];
- progress "downloading $what...";
- my $r = $ua->get(@_) or confess "$!";
- return undef if $r->code == 404;
- $r->is_success or fail f_ "failed to fetch %s: %s",
- $what, $r->status_line;
- return $r->decoded_content(charset => 'none');
-}
-
our ($dscdata,$dscurl,$dsc,$dsc_checked,$skew_warning_vsn);
sub act_local () { return $dryrun_level <= 1; }
@@ -783,6 +771,12 @@ our %defcfg = ('dgit.default.distro' => 'debian',
'dgit-distro.debian-backports.mirror' => 'http://backports.debian.org/debian-backports/',
'dgit-distro.ubuntu.git-check' => 'false',
'dgit-distro.ubuntu.mirror' => 'http://archive.ubuntu.com/ubuntu',
+ 'dgit-distro.ubuntucloud.git-check' => 'false',
+ 'dgit-distro.ubuntucloud.nominal-distro' => 'ubuntu',
+ 'dgit-distro.ubuntucloud.archive-query' => 'aptget:',
+ 'dgit-distro.ubuntucloud.mirror' => 'http://ubuntu-cloud.archive.canonical.com/ubuntu',
+ 'dgit-distro.ubuntucloud.aptget-suite-map' => 's#^([^-]+):([^:]+)$#${1}-updates/$2#; s#^(.+)-(.+):(.+)#$1-$2/$3#;',
+ 'dgit-distro.ubuntucloud.aptget-suite-rmap' => 's#/(.+)$#-$1#',
'dgit-distro.test-dummy.ssh' => "$td/ssh",
'dgit-distro.test-dummy.username' => "alice",
'dgit-distro.test-dummy.git-check' => "ssh-cmd",
@@ -1184,56 +1178,74 @@ sub cfg_apply_map ($$$) {
$$varref = $_;
}
-#---------- `ftpmasterapi' archive query method (nascent) ----------
+sub url_fetch ($;@) {
+ my ($url, %xopts) = @_;
+ # Ok404 => 1 means give undef for 404
+ # AccessBase => 'archive-query' (eg)
+ # CurlOpts => { key => value }
-sub archive_api_query_cmd ($) {
- my ($subpath) = @_;
- my @cmd = (@curl, qw(-sS));
- my $url = access_cfg('archive-query-url');
- if ($url =~ m#^https://([-.0-9a-z]+)/#) {
- my $host = $1;
- my $keys = access_cfg('archive-query-tls-key','RETURN-UNDEF') //'';
- foreach my $key (split /\:/, $keys) {
- $key =~ s/\%HOST\%/$host/g;
- if (!stat $key) {
- fail "for $url: stat $key: $!" unless $!==ENOENT;
- next;
- }
- fail f_ "config requested specific TLS key but do not know".
- " how to get curl to use exactly that EE key (%s)",
- $key;
-# push @cmd, "--cacert", $key, "--capath", "/dev/enoent";
-# # Sadly the above line does not work because of changes
-# # to gnutls. The real fix for #790093 may involve
-# # new curl options.
- last;
+ my $curl = WWW::Curl::Easy->new;
+ my $setopt = sub {
+ my ($k,$v) = @_;
+ my $x = $curl->setopt($k, $v);
+ confess "$k $v ".$curl->strerror($x)." ?" if $x;
+ };
+
+ my $response_body = '';
+ $setopt->(CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTPS|CURLPROTO_HTTP);
+ $setopt->(CURLOPT_URL, $url);
+ $setopt->(CURLOPT_NOSIGNAL, 1);
+ $setopt->(CURLOPT_WRITEDATA, \$response_body);
+
+ my $xcurlopts = $xopts{CurlOpts} // { };
+ keys %$xcurlopts;
+ while (my ($k,$v) = each %$xcurlopts) { $setopt->($k,$v); }
+
+ if ($xopts{AccessBase} && $url =~ m#^https://([-.0-9a-z]+)/#) {
+ foreach my $k ("$xopts{AccessBase}-tls-key",
+ "$xopts{AccessBase}-tls-curl-ca-args") {
+ fail "config option $k is obsolete and no longer supported"
+ if defined access_cfg($k, 'RETURN-UNDEF');
}
- # Fixing #790093 properly will involve providing a value
- # for this on clients.
- my $kargs = access_cfg('archive-query-tls-curl-ca-args','RETURN-UNDEF');
- push @cmd, split / /, $kargs if defined $kargs;
}
- push @cmd, $url.$subpath;
- return @cmd;
+
+ printdebug "query: fetching $url...\n";
+
+ local $SIG{PIPE} = 'IGNORE';
+
+ my $x = $curl->perform();
+ fail f_ "fetch of %s failed (%s): %s",
+ $url, $curl->strerror($x), $curl->errbuf
+ if $x;
+
+ my $code = $curl->getinfo(CURLINFO_HTTP_CODE);
+ if ($code eq '404' && $xopts{Ok404}) { return undef; }
+
+ fail f_ "fetch of %s gave HTTP code %s", $url, $code
+ unless $url =~ m#^file://# or $code =~ m/^2/;
+
+ confess unless defined $response_body;
+ return $response_body;
+}
+
+#---------- `ftpmasterapi' archive query method (nascent) ----------
+
+sub api_query_raw ($;$) {
+ my ($subpath, $ok404) = @_;
+ my $url = access_cfg('archive-query-url');
+ $url .= $subpath;
+ return url_fetch $url,
+ Ok404 => $ok404,
+ AccessBase => 'archive-query';
}
sub api_query ($$;$) {
- use JSON;
my ($data, $subpath, $ok404) = @_;
+ use JSON;
badcfg __ "ftpmasterapi archive query method takes no data part"
if length $data;
- my @cmd = archive_api_query_cmd($subpath);
- my $url = $cmd[$#cmd];
- push @cmd, qw(-w %{http_code});
- my $json = cmdoutput @cmd;
- unless ($json =~ s/\d+\d+\d$//) {
- failedcmd_report_cmd undef, @cmd;
- fail __ "curl failed to print 3-digit HTTP code";
- }
- my $code = $&;
- return undef if $code eq '404' && $ok404;
- fail f_ "fetch of %s gave HTTP code %s", $url, $code
- unless $url =~ m#^file://# or $code =~ m/^2/;
+ my $json = api_query_raw $subpath, $ok404;
+ return undef unless defined $json;
return decode_json($json);
}
@@ -1435,11 +1447,11 @@ sub canonicalise_suite_aptget {
my $val = $release->{$name};
if (defined $val) {
printdebug "release file $name: $val\n";
+ cfg_apply_map(\$val, 'suite rmap',
+ access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
$val =~ m/^$suite_re$/o or fail f_
"Release file (%s) specifies intolerable %s",
$aptget_releasefile, $name;
- cfg_apply_map(\$val, 'suite rmap',
- access_cfg('aptget-suite-rmap', 'RETURN-UNDEF'));
return $val
}
}
@@ -1724,7 +1736,7 @@ sub get_archive_dsc () {
foreach my $vinfo (@vsns) {
my ($vsn,$vsn_dscurl,$digester,$digest) = @$vinfo;
$dscurl = $vsn_dscurl;
- $dscdata = url_get($dscurl);
+ $dscdata = url_fetch($dscurl);
if (!$dscdata) {
$skew_warning_vsn = $vsn if !defined $skew_warning_vsn;
next;
@@ -1778,22 +1790,13 @@ sub check_for_git () {
my $suffix = access_cfg('git-check-suffix','git-suffix',
'RETURN-UNDEF') // '.git';
my $url = "$prefix/$package$suffix";
- my @cmd = (@curl, qw(-sS -I), $url);
- my $result = cmdoutput @cmd;
- $result =~ s/^\S+ 200 .*\n\r?\n//;
- # curl -sS -I with https_proxy prints
- # HTTP/1.0 200 Connection established
- $result =~ m/^\S+ (404|200) /s or
- fail +(__ "unexpected results from git check query - ").
- Dumper($prefix, $result);
- my $code = $1;
- if ($code eq '404') {
- return 0;
- } elsif ($code eq '200') {
- return 1;
- } else {
- die;
- }
+ my $result = url_fetch $url,
+ CurlOpts => { CURLOPT_NOBODY() => 1 },
+ Ok404 => 1,
+ AccessBase => 'git-check';
+ $result = defined $result;
+ printdebug "dgit-repos check_for_git => $result.\n";
+ return $result;
} elsif ($how eq 'true') {
return 1;
} elsif ($how eq 'false') {
@@ -1828,7 +1831,7 @@ sub prep_ud () {
}
sub mktree_in_ud_here () {
- playtree_setup $gitcfgs{local};
+ playtree_setup();
}
sub git_write_tree () {
@@ -3845,6 +3848,16 @@ END
printdone f_ "ready for work in %s", $dstdir;
}
+sub vcs_git_url_of_ctrl ($) {
+ my ($ctrl) = @_;
+ my $vcsgiturl = $ctrl->{'Vcs-Git'};
+ if (length $vcsgiturl) {
+ $vcsgiturl =~ s/\s+-b\s+\S+//g;
+ $vcsgiturl =~ s/\s+\[[^][]*\]//g;
+ }
+ return $vcsgiturl;
+}
+
sub clone ($) {
# in multisuite, returns twice!
# once in parent after first suite fetched,
@@ -3876,21 +3889,15 @@ sub clone ($) {
record_maindir();
setup_new_tree();
clone_set_head();
- my $giturl = access_giturl(1);
- if (defined $giturl) {
- runcmd @git, qw(remote add), 'origin', $giturl;
- }
if ($hasgit) {
progress __ "fetching existing git history";
git_fetch_us();
- runcmd_ordryrun_local @git, qw(fetch origin);
} else {
progress __ "starting new git history";
}
fetch_from_archive() or no_such_package;
- my $vcsgiturl = $dsc->{'Vcs-Git'};
+ my $vcsgiturl = vcs_git_url_of_ctrl $dsc;
if (length $vcsgiturl) {
- $vcsgiturl =~ s/\s+-b\s+\S+//g;
runcmd @git, qw(remote add vcs-git), $vcsgiturl;
}
clone_finish($dstdir);
@@ -4026,6 +4033,7 @@ sub get_source_format () {
}
$_ = <F>;
F->error and confess "$!";
+ close F;
chomp;
return ($_, \%options);
}
@@ -4965,7 +4973,8 @@ sub cmd_update_vcs_git () {
get_archive_dsc();
$ctrl = $dsc;
}
- my $url = getfield $ctrl, 'Vcs-Git';
+ my $url = vcs_git_url_of_ctrl $ctrl;
+ fail 'no Vcs-Git header in control file' unless length $url;
my @cmd;
my $orgurl = cfg 'remote.vcs-git.url', 'RETURN-UNDEF';
@@ -4973,12 +4982,12 @@ sub cmd_update_vcs_git () {
print STDERR f_ "setting up vcs-git: %s\n", $url;
@cmd = (@git, qw(remote add vcs-git), $url);
} elsif ($orgurl eq $url) {
- print STDERR f_ "vcs git already configured: %s\n", $url;
+ print STDERR f_ "vcs git unchanged: %s\n", $url;
} else {
print STDERR f_ "changing vcs-git url to: %s\n", $url;
@cmd = (@git, qw(remote set-url vcs-git), $url);
}
- runcmd_ordryrun_local @cmd;
+ runcmd_ordryrun_local @cmd if @cmd;
if ($dofetch) {
print f_ "fetching (%s)\n", "@ARGV";
runcmd_ordryrun_local @git, qw(fetch vcs-git), @ARGV;
@@ -7339,10 +7348,8 @@ sub cmd_archive_api_query {
badusage __ "need only 1 subpath argument" unless @ARGV==1;
my ($subpath) = @ARGV;
local $isuite = 'DGIT-API-QUERY-CMD';
- my @cmd = archive_api_query_cmd($subpath);
- push @cmd, qw(-f);
- debugcmd ">",@cmd;
- exec @cmd or fail f_ "exec curl: %s\n", $!;
+ my $json = api_query_raw $subpath;
+ print $json or die "$!";
}
sub repos_server_url () {
@@ -7598,6 +7605,9 @@ sub parseopts () {
f_ "%s: warning: ignoring unknown force option %s\n",
$us, $_;
$_='';
+ } elsif (m/^--for-push$/s) {
+ push @ropts, $_;
+ $access_forpush = 1;
} elsif (m/^--config-lookup-explode=(.+)$/s) {
# undocumented, for testing
push @ropts, $_;
diff --git a/dgit-maint-bpo.7.pod b/dgit-maint-bpo.7.pod
new file mode 100644
index 0000000..e977d25
--- /dev/null
+++ b/dgit-maint-bpo.7.pod
@@ -0,0 +1,141 @@
+=head1 NAME
+
+dgit - tips for maintaining official Debian backports
+
+=head1 INTRODUCTION
+
+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>.
+
+=head1 TERMINOLOGY
+
+Let the I<master> branch contain the packaging history uploaded to
+Debian unstable, and the I<buster-bpo> branch be where you prepare
+your uploads to the B<buster-backports> suite.
+
+A B<merging> backports workflow means that each time an upload
+migrates to Debian testing and you want to prepare an upload to
+B<buster-backports>, you do something like this:
+
+=over 4
+
+ % git checkout buster-bpo
+ % git merge master
+ % dch --bpo
+ % # any other changes needed for backporting
+ % git commit -a
+ % # try a build
+
+=back
+
+A B<rebasing> backports workflow means that you throw away the history
+of the I<buster-bpo> branch each time a new version migrates to Debian
+testing, something equivalent to this:
+
+=over 4
+
+ % git checkout -B buster-bpo master
+ % dch --bpo
+ % # any other changes needed for backporting
+ % git commit -a
+ % # try a build
+
+=back
+
+If you use a merging backports workflow, your changelog contains
+entries for each previous upload to B<buster-backports>; in a rebasing
+workflow, it contains only the latest.
+
+=head1 CHOOSING BETWEEN THE TWO WORKFLOWS
+
+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.
+
+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.
+
+=head1 TIPS FOR A MERGING WORKFLOW
+
+=head2 Use dgit's branches
+
+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.
+
+You would use
+
+=over 4
+
+ % dgit clone foo bullseye
+
+=back
+
+for a new backport of package 'foo' to B<buster-backports>, and then
+
+=over 4
+
+ % dgit fetch bullseye
+ % git merge dgit/dgit/bullseye
+
+=back
+
+when new versions migrate to Debian testing.
+
+=head1 TIPS FOR A REBASING WORKFLOW
+
+=head2 Use dgit's branches
+
+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
+
+=over 4
+
+ % dgit fetch bullseye
+ % git checkout -B buster-bpo dgit/dgit/bullseye
+ % # use git-cherry-pick(1) to (re)apply any needed backporting fixes
+
+=back
+
+=head2 Overwriting
+
+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.
+
+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<buster-backports> you wish to overwrite.
+
+Suppose that the last upload to B<buster-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<--overwrite=1.2.2-1~bpo10+1>.
+
+Alternatively, you can perform the pseudomerge that I<--overwrite>
+would have done yourself:
+
+=over 4
+
+ % dgit fetch buster-backports
+ % git merge -s ours dgit/dgit/buster-backports
+ % dgit push-source
+
+=back
+
+=head1 SEE ALSO
+
+dgit(1), dgit(7), https://backports.debian.org/
+
+=head1 AUTHOR
+
+This manpage was written and is maintained by Sean Whitton
+<spwhitton@spwhitton.name>.
diff --git a/dgit.1 b/dgit.1
index 8ede01f..a7346e5 100644
--- a/dgit.1
+++ b/dgit.1
@@ -1327,6 +1327,12 @@ Force on or off the use of the absurd git-apply emulation
when running gbp pq import
when importing a package from a .dsc.
See Debian bug #841867.
+.TP
+.BR \-\-for\-push
+Override the dgit-distro.distro.readonly configuration setting,
+to specify that we have read/write access
+and should use the corresponding git and achive access approach
+even if the operation is a read-only one.
.SH CONFIGURATION
dgit can be configured via the git config system.
You may set keys with git-config (either in system-global or per-tree
@@ -1471,7 +1477,7 @@ or when pushing and
.TP
.BI dgit-distro. distro .git-create " " ssh-cmd | true
.TP
-.BR dgit-distro. \fIdistro\fR .archive-query " " ftpmasterapi: " | " madison: "\fIdistro\fR | " dummycat: "\fI/path\fR | " sshpsql: \fIuser\fR @ \fIhost\fR : \fIdbname\fR
+.BR dgit-distro. \fIdistro\fR .archive-query " " ftpmasterapi: " | " madison: "\fIdistro\fR | " dummycat: "\fI/path\fR | " sshpsql: \fIuser\fR @ \fIhost\fR : \fIdbname\fR " " | " aptget:"
.TP
.BR dgit-distro. \fIdistro\fR .archive-query- ( url | tls-key | curl-ca-args )
.TP
@@ -1519,7 +1525,7 @@ also the \-\-ssh= and \-\-ssh: options.
Default git user.email and user.name for new trees. See
.BR "dgit setup-new-tree" .
.TP
-.BR gpg ", " dpkg- "..., " debsign ", " git ", " curl ", " dput ", " LWP::UserAgent
+.BR gpg ", " dpkg- "..., " debsign ", " git ", [" lib ] curl ", " dput
and other subprograms and modules used by dgit are affected by various
environment variables. Consult the documentation for those programs
for details.
diff --git a/git-debpush b/git-debpush
index 63057ed..c3b067d 100755
--- a/git-debpush
+++ b/git-debpush
@@ -35,9 +35,11 @@ set -o pipefail
# mode; if there is a previous tag, and no quilt mode provided, assume
# same quilt mode as in previous tag created by this script
-# ---- Helper functions and variables
+# **** Helper functions and variables ****
us="$(basename $0)"
+git_playtree_setup=git-playtree-setup ###substituted###
+git_playtree_setup=${DEBPUSH_GIT_PLAYTREE_SETUP-$git_playtree_setup}
cleanup() {
if [ -d "$temp" ]; then
@@ -63,10 +65,111 @@ get_file_from_ref () {
fi
}
-# ---- Parse command line
+failed_check=false
+fail_check () {
+ local check=$1; shift
+ local check_is_forced=false
+
+ case ",$force," in
+ *",$check,"*) check_is_forced=true ;;
+ esac
+ if $force_all || $check_is_forced; then
+ echo >&2 "$us: warning: $* ('$check' check)"
+ else
+ echo >&2 "$us: $* ('$check' check)"
+ failed_check=true
+ fi
+}
+
+fail_check_upstream_nonidentical () {
+ fail_check upstream-nonidentical \
+ "the upstream source in tag $upstream_tag is not identical to the upstream source in $branch"
+}
+
+find_last_tag () {
+ local prefix=$1
+
+ set +o pipefail # perl will SIGPIPE git-log(1) here
+ git log --pretty=format:'%D' --decorate=full "$branch" \
+ | perl -wne 'use Dpkg::Version;
+ @pieces = split /, /, $_;
+ @debian_tag_vs = sort { version_compare($b, $a) }
+ map { m|tag: refs/tags/'"$prefix"'(.+)| ? $1 : () } @pieces;
+ if (@debian_tag_vs) { print "'"$prefix"'$debian_tag_vs[0]\n"; exit }'
+ set -o pipefail
+}
+
+check_treesame () {
+ local first=$1
+ local second=$2
+ shift 2
+
+ set +e
+ git diff --quiet --exit-code "$first".."$second" -- . "$@"
+ git_diff_rc=$?
+ set -e
+
+ # show the user what the difference was
+ if [ $git_diff_rc = 1 ]; then
+ git diff --compact-summary "$first".."$second" -- . "$@"
+ fi
+
+ if [ $git_diff_rc -le 1 ]; then
+ return $git_diff_rc
+ else
+ fail "'git diff' exited with unexpected code $git_diff_rc"
+ fi
+}
+
+check_patches_apply () {
+ local should_match_branch="$1"
+
+ local playground="$(git rev-parse --git-dir)/gdp"
+ local playtree="$playground/apply-patches"
+ local git_apply_rc=0
+
+ rm -rf "$playground"
+ mkdir -p "$playtree"
+ local pwd="$(pwd)"
+ cd "$playtree"
+ "$git_playtree_setup" .
+
+ # checking out the upstream source and then d/patches on top
+ # ensures this check will work for a variety of quilt modes
+ git checkout -b upstream "$upstream_committish"
+ git checkout "$branch_commit" -- debian
+
+ if [ -s "debian/patches/series" ]; then
+ while read patch; do
+ shopt -s extglob; patch="${patch%%?( )#*}"; shopt -u extglob
+ if [ -z "$patch" ]; then continue; fi
+ set +e
+ git apply --index "debian/patches/$patch"
+ git_apply_rc=$?
+ set -e
+ if ! [ $git_apply_rc = 0 ]; then
+ fail_check patches-applicable \
+ "'git apply' failed to apply patch $patch"
+ break
+ fi
+ done <debian/patches/series
+
+ if $should_match_branch && [ $git_apply_rc = 0 ]; then
+ git commit -q -a -m"commit result of applying all patches"
+ check_treesame HEAD "$branch_commit" ':!debian' \
+ || fail_check patches-applicable \
+ "applying all patches does not yield $branch"
+ fi
+ fi
+
+ cd "$pwd"
+ rm -rf "$playground"
+}
+
+# **** Parse command line ****
getopt=$(getopt -s bash -o 'nfu:' \
- -l 'no-push,force,branch:,remote:,distro:,upstream:,quilt:,gbp,dpm,\
+ -l 'no-push,force::,branch:,remote:,distro:,upstream:,quilt:,gbp,dpm,\
baredebian,baredebian+git,baredebian+tarball' \
-n "$us" -- "$@")
eval "set - $getopt"
@@ -74,7 +177,8 @@ set -e$DGIT_TEST_DEBPUSH_DEBUG
git_tag_opts=()
pushing=true
-force=false
+force_all=false
+force=""
distro=debian
quilt_mode=""
branch="HEAD"
@@ -83,7 +187,7 @@ while true; do
case "$1" in
'-n'|'--no-push') pushing=false; shift; continue ;;
'-u') git_tag_opts+=(-u "$2"); shift 2; continue ;;
- '-f'|'--force') force=true; shift; continue ;;
+ '-f') force_all=true; shift; continue ;;
'--gbp') quilt_mode='gbp'; shift; continue ;;
'--dpm') quilt_mode='dpm'; shift; continue ;;
'--branch') branch=$2; shift 2; continue ;;
@@ -98,6 +202,18 @@ while true; do
fail "--baredebian+tarball quilt mode not supported"
;;
+ # we require the long form of the option to skip individual
+ # checks, not permitting `-f check`, to avoid problems if we
+ # later want to introduce positional args
+ '--force')
+ case "$2" in
+ '')
+ force_all=true ;;
+ *)
+ force="$force,$2" ;;
+ esac
+ shift 2; continue ;;
+
'--') shift; break ;;
*) badusage "unknown option $1" ;;
esac
@@ -114,10 +230,18 @@ case "$quilt_mode" in
*) badusage "invalid quilt mode: $quilt_mode" ;;
esac
-# ---- Gather git information
+# **** Early sanity check ****
+
+if [ "$branch" = "HEAD" ] \
+ && ! git symbolic-ref --quiet HEAD >/dev/null; then
+ fail_check detached \
+ "HEAD is detached; you probably don't want to debpush it"
+fi
+
+# **** Gather git information ****
remoteconfigs=()
-push_branch=()
+to_push=()
# Maybe $branch is a symbolic ref. If so, resolve it
branchref="$(git symbolic-ref -q $branch || test $? = 1)"
@@ -144,11 +268,14 @@ esac
case "$branch" in
refs/heads/*)
b=${branch#refs/heads/}
- push_branch+=("$b")
+ to_push+=("$b")
remoteconfigs+=( branch.$b.pushRemote branch.$b.remote )
;;
esac
+# resolve $branch to a commit
+branch_commit="$(git rev-parse --verify ${branch}^{commit})"
+
# also check, if the branch does not have its own pushRemote or
# remote, whether there's a default push remote configured
remoteconfigs+=(remote.pushDefault)
@@ -163,7 +290,7 @@ if $pushing && [ "x$remote" = "x" ]; then
fi
fi
-# ---- Gather source package information
+# **** Gather source package information ****
temp=$(mktemp -d)
trap cleanup EXIT
@@ -175,36 +302,14 @@ target=$(cd $temp; dpkg-parsechangelog -SDistribution)
rm -rf "$temp"
trap - EXIT
-# ---- Useful sanity checks
-
-if ! $force; then
-
- if [ "$target" = "UNRELEASED" ]; then
- fail "UNRELEASED changelog"
- fi
-
- # TODO additional checks we might do:
- #
- # - are we uploading to a different suite from the last tag
- # (e.g. unstable after experimental)? user should pass option to
- # confirm
- #
- # - walking backwards from $branch, if there is an archive/ strictly
- # before we reach most recent debian/ tag, error, this might be a
- # push of the dgit view to the maintainer branch
-
-fi
-
-# ---- Create the git tag
-
format="$(get_file_from_ref debian/source/format)"
case "$format" in
'3.0 (quilt)') upstream=true ;;
'3.0 (native)') upstream=false ;;
'1.0'|'')
- if get_file_from_ref debian/source/options | grep '^-sn *$'; then
+ if get_file_from_ref debian/source/options | grep -q '^-sn *$'; then
upstream=false
- elif get_file_from_ref debian/source/options | grep '^-sk *$'; then
+ elif get_file_from_ref debian/source/options | grep -q '^-sk *$'; then
upstream=true
else
fail 'please see "SOURCE FORMAT 1.0" in git-debpush(1)'
@@ -215,6 +320,11 @@ case "$format" in
;;
esac
+# **** Gather git history information ****
+
+last_debian_tag=$(find_last_tag "debian/")
+last_archive_tag=$(find_last_tag "archive/debian/")
+
upstream_info=""
if $upstream; then
if [ "x$upstream_tag" = x ]; then
@@ -238,25 +348,116 @@ if $upstream; then
fi
upstream_committish=$(git rev-parse "refs/tags/${upstream_tag}"^{})
upstream_info=" upstream-tag=$upstream_tag upstream=$upstream_committish"
+ to_push+=("$upstream_tag")
+fi
+
+# **** Useful sanity checks ****
+
+# ---- UNRELEASED suite
+
+if [ "$target" = "UNRELEASED" ]; then
+ fail_check unreleased "UNRELEASED changelog"
+fi
+
+# ---- Pushing dgit view to maintainer view
+
+if ! [ "x$last_debian_tag" = "x" ] && ! [ "x$last_archive_tag" = "x" ]; then
+ last_debian_tag_c=$(git rev-parse "$last_debian_tag"^{})
+ last_archive_tag_c=$(git rev-parse "$last_archive_tag"^{})
+ if ! [ "$last_debian_tag_c" = "$last_archive_tag_c" ] \
+ && git merge-base --is-ancestor \
+ "$last_debian_tag" "$last_archive_tag"; then
+ fail_check dgit-view \
+"looks like you might be trying to push the dgit view to the maintainer branch?"
+ fi
fi
+# ---- Targeting different suite
+
+if ! [ "x$last_debian_tag" = "x" ]; then
+ temp=$(mktemp -d)
+ trap cleanup EXIT
+ mkdir "$temp/debian"
+ git cat-file blob "$last_debian_tag":debian/changelog >"$temp/debian/changelog"
+ prev_target=$(cd $temp; dpkg-parsechangelog -SDistribution)
+ rm -rf "$temp"
+ trap - EXIT
+
+ if ! [ "$prev_target" = "$target" ] && ! [ "$target" = "UNRELEASED" ]; then
+ fail_check suite \
+"last upload targeted $prev_target, now targeting $target; might be a mistake?"
+ fi
+fi
+
+# ---- Upstream tag is not ancestor of $branch
+
+if ! [ "x$upstream_tag" = "x" ] \
+ && ! git merge-base --is-ancestor "$upstream_tag" "$branch" \
+ && ! [ "$quilt_mode" = "baredebian" ]; then
+ fail_check upstream-nonancestor \
+ "upstream tag $upstream_tag is not an ancestor of $branch; probably a mistake"
+fi
+
+# ---- Quilt mode-specific checks
+
+case "$quilt_mode" in
+ gbp)
+ check_treesame "$upstream_tag" "$branch" ':!debian' ':!**.gitignore' \
+ || fail_check_upstream_nonidentical
+ check_patches_apply false
+ ;;
+ unapplied)
+ check_treesame "$upstream_tag" "$branch" ':!debian' \
+ || fail_check_upstream_nonidentical
+ check_patches_apply false
+ ;;
+ baredebian)
+ check_patches_apply false
+ ;;
+ dpm|nofix)
+ check_patches_apply true
+ ;;
+esac
+
+# ---- git-debrebase branch format checks
+
+# only check branches, since you can't run `git debrebase conclude` on
+# non-branches
+case "$branch" in
+ refs/heads/*)
+ # see "STITCHING, PSEUDO-MERGES, FFQ RECORD" in git-debrebase(5)
+ ffq_prev_ref="refs/ffq-prev/${branch#refs/}"
+ if git show-ref --quiet --verify "$ffq_prev_ref"; then
+ fail_check unstitched \
+ "this looks like an unstitched git-debrebase branch, which should not be pushed"
+ fi
+esac
+
+# ---- Summary
+
+if $failed_check; then
+ # We don't mention the --force=check options here as those are
+ # mainly for use by scripts, or when you already know what check
+ # is going to fail before you invoke git-debpush. Keep the
+ # script's terminal output as simple as possible. No "see the
+ # manpage"!
+ fail "some check(s) failed; you can pass --force to ignore them"
+fi
+
+# **** Create the git tag ****
+
# convert according to DEP-14 rules
git_version=$(echo $version | tr ':~' '%_' | sed 's/\.(?=\.|$|lock$)/.#/g')
debian_tag="$distro/$git_version"
+to_push+=("$debian_tag")
# If the user didn't supply a quilt mode, look for it in a previous
# tag made by this script
if [ "x$quilt_mode" = "x" ] && [ "$format" = "3.0 (quilt)" ]; then
- set +o pipefail # perl will SIGPIPE git-log(1) here
- tag=$(git log --pretty=format:'%D' --decorate=full "$branch" \
- | perl -wne 'use Dpkg::Version;
- @pieces = split /, /, $_;
- @debian_tag_vs = sort {version_compare($b, $a)}
- map { m|tag: refs/tags/debian/(.+)| ? $1 : () } @pieces;
- if (@debian_tag_vs) { print "debian/$debian_tag_vs[0]\n"; exit }')
- if [ "x$tag" != "x" ]; then
- quilt_mode=$(git cat-file -p $(git rev-parse "$tag") \
+ set +o pipefail # perl will SIGPIPE git-cat-file(1) here
+ if [ "x$last_debian_tag" != "x" ]; then
+ quilt_mode=$(git cat-file -p $(git rev-parse "$last_debian_tag") \
| perl -wne \
'm/^\[dgit.*--quilt=([a-z+]+).*\]$/;
if ($1) { print "$1\n"; exit }')
@@ -275,16 +476,16 @@ if [ "$format" = "3.0 (quilt)" ]; then
fi
fi
-git tag "${git_tag_opts[@]}" -s -F- "$debian_tag" "$branch" <<EOF
-$source release $version for $target
+tagmessage="$source release $version for $target
[dgit distro=$distro split$quilt_mode_text]
[dgit please-upload$upstream_info]
-EOF
+"
+
+git tag "${git_tag_opts[@]}" -s -m "$tagmessage" "$debian_tag" "$branch"
-# ---- Do a git push
+# **** Do a git push ****
if $pushing; then
- # xxx when user can specify upstream_tag, must cope with spaces
- git push "$remote" "${push_branch[@]}" $upstream_tag "$debian_tag"
+ git push "$remote" "${to_push[@]}"
fi
diff --git a/git-debpush.1.pod b/git-debpush.1.pod
index 0cd274d..5e40e3c 100644
--- a/git-debpush.1.pod
+++ b/git-debpush.1.pod
@@ -146,10 +146,6 @@ upload your package.
Just tag, don't push.
-=item B<--force>|B<-f>
-
-Don't perform checks designed to prevent broken uploads.
-
=item B<-u> I<keyid>
Passed on to git-tag(1).
@@ -182,6 +178,77 @@ git would use if you typed "git push BRANCH".
What distribution name to embed in the signed tag. Defaults to
"debian".
+=item B<--force>|B<-f>
+
+Ignore the results of all checks designed to prevent broken uploads.
+
+=item B<--force>=I<check>[,I<check>] ...
+
+Override individual checks designed to prevent broken uploads. May be
+specified more than once. Valid values for I<check> are:
+
+=over 4
+
+=item B<suite>
+
+Permit uploading to a different suite than the target of the most
+recent upload made with B<git-debpush> (e.g. when uploading to
+Debian unstable after uploading to Debian experimental).
+
+=item B<upstream-nonancestor>
+
+Ignore the fact that the upstream tag is not an ancestor of the branch
+to be tagged (skipping this check is implied by B<--quilt=baredebian>).
+
+=item B<upstream-nonidentical>
+
+Ignore any differences between the upstream source in the upstream tag
+and the upstream source in the branch to be tagged (this check is only
+run when using B<--quilt=gbp> or B<--quilt=unapplied>).
+
+=item B<patches-applicable>
+
+Ignore any failures of the following two checks:
+
+=over 4
+
+=item
+
+With B<--quilt=gbp>, B<--quilt=unapplied>, B<--quilt=baredebian>,
+B<--quilt=dpm>, and B<--quilt=nofix>, the quilt patches should apply
+cleanly to the upstream source with git-apply(1).
+
+=item
+
+With B<--quilt=dpm> and B<--quilt=nofix>, applying the quilt patches
+to the upstream source should produce exactly the source tree to be
+tagged.
+
+=back
+
+=item B<unreleased>
+
+Permit upload to a suite called UNRELEASED.
+
+=item B<dgit-view>
+
+Ignore apparently pushing the dgit view of a package (as produced by
+B<dgit clone>) to the maintainer branch, where the dgit view and the
+maintainer view of the package are not identical.
+
+=item B<unstitched>
+
+Ignore the fact that the branch to be pushed seems to be a
+git-debrebase(1) branch in an unstitched state (see git-debrebase(5)).
+
+=back
+
+=item B<detached>
+
+Ignore the fact that HEAD is to be tagged, but HEAD is detached (this
+check is only run when B<--branch=HEAD> or no B<--branch> option is
+specified).
+
=back
=head1 SEE ALSO
diff --git a/git-debrebase b/git-debrebase
index 01429fb..06f56d8 100755
--- a/git-debrebase
+++ b/git-debrebase
@@ -3,7 +3,8 @@
# Script helping make fast-forwarding histories while still rebasing
# upstream deltas when working on Debian packaging
#
-# Copyright (C)2017,2018 Ian Jackson
+# Copyright (C)2017-2019 Ian Jackson
+# Copyright (C)2019 Niko Tyni
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -120,7 +121,6 @@ our $playprefix = 'debrebase';
our $rd;
our $workarea;
-our @git = qw(git);
our @dgit = qw(dgit);
sub in_workarea ($) {
diff --git a/git-debrebase.1.pod b/git-debrebase.1.pod
index af6e364..d1b4507 100644
--- a/git-debrebase.1.pod
+++ b/git-debrebase.1.pod
@@ -1,21 +1,35 @@
=head1 NAME
-git-debrebase - delta queue rebase tool for Debian packaging
+git-debrebase - tool to maintain series of Debian changes to upstream source
=head1 SYNOPSYS
git-debrebase [<options...>] [-- <git-rebase options...>]
git-debrebase [<options...>] <operation> [<operation options...>
-=head1 INTRODUCTION
+=head1 QUICK REFERENCE
-git-debrebase is a tool for representing in git,
-and manpulating,
-Debian packages based on upstream source code.
+These are most of the commands you will regularly need:
+
+ git debrebase -i # edit the patch queue
+ git debrebase conclude && git push # push to eg salsa
+ git debrebase conclude && dgit push-source # source-only upload
+ git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg "v1.2.3"
+ dpkg-buildpackage -uc -b # get test debs, at any time
+
+To add patches, or edit the packaging, just make git commits.
+Ignore anything that may appear in debian/patches.
+Avoid using "git pull" and "git merge" without "--ff-only".
+
+git-debrebase has a special branch format, so see
+"CONVERTING AN EXISTING PACKAGE" in L<dgit-maint-debrebase(7)>.
+
+=head1 GUIDE TO DOCUMENTATION
This is the command line reference.
-Please read the tutorial
-L<dgit-maint-debrebase(7)>.
+There is also a detailed workflow tutorial at
+L<dgit-maint-debrebase(7)>
+(on which the above "QUICK REFERENCE" is based).
For background, theory of operation,
and definitions see L<git-debrebase(5)>.
@@ -619,6 +633,6 @@ The result is the laundered branch.
=head1 SEE ALSO
git-debrebase(1),
-dgit-maint-rebase(7),
+dgit-maint-debrebase(7),
dgit(1),
gitglossary(7)
diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index d23c6b2..8209fc1 100644
--- a/git-debrebase.5.pod
+++ b/git-debrebase.5.pod
@@ -391,7 +391,7 @@ 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.
-See dgit-maint-rebase(7)
+See dgit-maint-debrebase(7)
for a discussion of what kinds of behaviours
should be be avoided
because
diff --git a/git-playtree-setup b/git-playtree-setup
new file mode 100755
index 0000000..184de4d
--- /dev/null
+++ b/git-playtree-setup
@@ -0,0 +1,48 @@
+#!/bin/bash
+#
+# usage:
+# rm -rf .git/some/play/thing
+# git-playtree-setup .git/some/play/thing
+# or:
+# mkdir .git/some/play/thing
+# cd .git/some/play/thing
+# git-playtree-setup .
+
+set -e${GIT_PLAYTREE_SETUP_DEBUG}
+
+target=$1; shift
+
+case "$#.$target" in
+0.[^-]*) ;;
+*) echo >&2 'bad usage' ; exit 8 ;;
+esac
+
+[ "x$target" = x. ] || mkdir $target
+cd $target
+
+gcd=$(cd .. && git rev-parse --git-common-dir)
+case "$gcd" in
+/*) ;;
+*) gcd="../$gcd" ;;
+esac
+
+git init -q
+git config gc.auto 0
+
+unset_all () { git config --local --unset-all $key || [ $? = 5 ]; }
+
+for key in \
+ user.email user.name user.useConfigOnly \
+ core.sharedRepository \
+ core.compression core.looseCompression \
+ core.bigFileThreshold core.fsyncObjectFiles \
+; do
+ unset_all
+ (
+ git --git-dir="$gcd" config -z --get-all $key || [ $? = 1 ]
+ ) | xargs -n1 -0r -- \
+ git config --local --add $key
+done
+
+rm -rf .git/objects
+ln -s "$gcd/objects" .git/objects
diff --git a/infra/dgit-repos-policy-debian b/infra/dgit-repos-policy-debian
index bc370d2..ad21564 100755
--- a/infra/dgit-repos-policy-debian
+++ b/infra/dgit-repos-policy-debian
@@ -1,7 +1,7 @@
#!/usr/bin/perl -w
# dgit repos policy hook script for Debian
#
-# Copyright (C) 2015-2016 Ian Jackson
+# Copyright (C) 2015-2019 Ian Jackson
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/infra/dgit-repos-server b/infra/dgit-repos-server
index 2b20d1e..f94315a 100755
--- a/infra/dgit-repos-server
+++ b/infra/dgit-repos-server
@@ -3,7 +3,7 @@
#
# git protocol proxy to check dgit pushes etc.
#
-# Copyright (C) 2014-2016 Ian Jackson
+# Copyright (C) 2014-2017,2019 Ian Jackson
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -591,7 +591,8 @@ sub parsetag_general ($$) {
if ($dgititemfn->()) {
} elsif (s/^distro\=(\S+) //) {
$distrofn->($1);
- } elsif (s/^[-+.=0-9a-z]\S* //) {
+ } elsif (s/^([-+.=0-9a-z]\S*) //) {
+ printdebug " parsetag ignoring unrecognised \`$1'\n";
} else {
die "unknown dgit info in tag ($_)";
}
@@ -1213,7 +1214,7 @@ END
$upstreamc = $1;
} elsif (s/^upstream-tag=(\S+) //) {
$upstreamt = $1;
- } elsif (s/^quilt=([-+0-9a-z]+) //) {
+ } elsif (s/^--quilt=([-+0-9a-z]+) //) {
$quilt = $1;
} else {
return 0;
@@ -1262,7 +1263,7 @@ END
$clogf->('Version', $version);
$clogf->('Source', $package);
- @fetch = (@dgit, qw(fetch), $suite);
+ @fetch = (@dgit, qw(--for-push fetch), $suite);
debugcmd "+",@_;
$!=0; $?=-1;
if (system @fetch) {
@@ -1282,8 +1283,9 @@ END
if (defined $quilt) {
push @dgitcmd, "--quilt=$quilt";
if ($quilt =~ m/baredebian/) {
- die "needed upstream commmitish with --quilt=baredebian";
- push @dgitcmd, "--upstream-commitish=$upstreamc";
+ die "needed upstream commmitish with --quilt=baredebian"
+ unless defined $upstreamc;
+ push @dgitcmd, "--upstream-commitish=refs/tags/$upstreamt";
}
}
push @dgitcmd, qw(push-source --new --overwrite), $suite;
diff --git a/po/en_US.po b/po/en_US.po
index b0e64d4..bd4bc79 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dgit ongoing\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 21:54+0000\n"
+"POT-Creation-Date: 2019-08-10 18:42+0000\n"
"PO-Revision-Date: 2018-08-26 16:55+0100\n"
"Last-Translator: Ian Jackson <ijackson@chiark.greenend.org.uk>\n"
"Language-Team: dgit developrs <dgit@packages.debian.org>\n"
@@ -17,78 +17,73 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../dgit:242
+#: ../dgit:265
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
-#: ../dgit:249
+#: ../dgit:272
msgid "warning: overriding problem due to --force:\n"
msgstr ""
-#: ../dgit:257
+#: ../dgit:280
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
-#: ../dgit:262
+#: ../dgit:285
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
-#: ../dgit:487
+#: ../dgit:517
#, perl-format
msgid "build host child %s"
msgstr ""
-#: ../dgit:492 ../dgit:498
+#: ../dgit:522 ../dgit:528
#, perl-format
msgid "connection lost: %s"
msgstr ""
-#: ../dgit:493
+#: ../dgit:523
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
-#: ../dgit:501
+#: ../dgit:531
#, perl-format
msgid "eof (reading %s)"
msgstr ""
-#: ../dgit:508
+#: ../dgit:538
msgid "protocol message"
msgstr ""
-#: ../dgit:516
+#: ../dgit:546
#, perl-format
msgid "`%s'"
msgstr ""
-#: ../dgit:537
+#: ../dgit:567
msgid "bad byte count"
msgstr ""
-#: ../dgit:540
+#: ../dgit:570
msgid "data block"
msgstr ""
-#: ../dgit:621
-#, perl-format
-msgid "failed to fetch %s: %s"
-msgstr ""
-
-#: ../dgit:633
+#: ../dgit:649
#, perl-format
msgid "%s ok: %s"
msgstr ""
-#: ../dgit:635
+#: ../dgit:651
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
-#: ../dgit:660
+#: ../dgit:676
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@ -109,141 +104,147 @@ msgid ""
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
-#: ../dgit:679
+#: ../dgit:695
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
-#: ../dgit:683
+#: ../dgit:699
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
-#: ../dgit:688
+#: ../dgit:704
msgid "too few arguments"
msgstr ""
-#: ../dgit:799
+#: ../dgit:820
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
-#: ../dgit:802
+#: ../dgit:823
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
-#: ../dgit:822
+#: ../dgit:843
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
-#: ../dgit:863
+#: ../dgit:884
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
-#: ../dgit:878
+#: ../dgit:899
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
-#: ../dgit:894
+#: ../dgit:915
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
-#: ../dgit:914
+#: ../dgit:935
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
-#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:953
+#, perl-format
+msgid "unknown %s `%s'"
+msgstr ""
+
+#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209
msgid "internal error"
msgstr ""
-#: ../dgit:925
+#: ../dgit:960
msgid "pushing but distro is configured readonly"
msgstr ""
-#: ../dgit:929
+#: ../dgit:964
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
-#: ../dgit:1094
-msgid "this operation does not support multiple comma-separated suites"
-msgstr ""
-
-#: ../dgit:1140
+#: ../dgit:987
#, perl-format
msgid ""
-"config requested specific TLS key but do not know how to get curl to use "
-"exactly that EE key (%s)"
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
msgstr ""
-#: ../dgit:1161
-msgid "ftpmasterapi archive query method takes no data part"
+#: ../dgit:1150
+msgid "this operation does not support multiple comma-separated suites"
msgstr ""
-#: ../dgit:1169
-msgid "curl failed to print 3-digit HTTP code"
+#: ../dgit:1217
+#, perl-format
+msgid "fetch of %s failed (%s): %s"
msgstr ""
-#: ../dgit:1173
+#: ../dgit:1224
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
-#: ../dgit:1189
+#: ../dgit:1245
+msgid "ftpmasterapi archive query method takes no data part"
+msgstr ""
+
+#: ../dgit:1263
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
-#: ../dgit:1193
+#: ../dgit:1267
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
-#: ../dgit:1195
+#: ../dgit:1269
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
-#: ../dgit:1197
+#: ../dgit:1271
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
-#: ../dgit:1199 ../dgit:1224
+#: ../dgit:1273 ../dgit:1298
msgid "bad ftpmaster api response: "
msgstr ""
-#: ../dgit:1213
+#: ../dgit:1287
#, perl-format
msgid "bad version: %s\n"
msgstr ""
-#: ../dgit:1215
+#: ../dgit:1289
msgid "bad component"
msgstr ""
-#: ../dgit:1218
+#: ../dgit:1292
msgid "bad filename"
msgstr ""
-#: ../dgit:1220
+#: ../dgit:1294
msgid "bad sha256sum"
msgstr ""
-#: ../dgit:1271
+#: ../dgit:1345
msgid "aptget archive query method takes no data part"
msgstr ""
-#: ../dgit:1355
+#: ../dgit:1429
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
@@ -251,163 +252,159 @@ msgid ""
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
-#: ../dgit:1377
+#: ../dgit:1453
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
-#: ../dgit:1405
+#: ../dgit:1479
msgid "apt-get source did not produce a .dsc"
msgstr ""
-#: ../dgit:1406
+#: ../dgit:1480
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
-#: ../dgit:1511
+#: ../dgit:1585
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
"in suite %s; --existing-package may help"
msgstr ""
-#: ../dgit:1702
+#: ../dgit:1724
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
-#: ../dgit:1705
+#: ../dgit:1727
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
-#: ../dgit:1707
+#: ../dgit:1729
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
-#: ../dgit:1727
+#: ../dgit:1749
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
-#: ../dgit:1733
+#: ../dgit:1755
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
-#: ../dgit:1760
+#: ../dgit:1782
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
-#: ../dgit:1777
-msgid "unexpected results from git check query - "
-msgstr ""
-
-#: ../dgit:1792
+#: ../dgit:1805
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
-#: ../dgit:1807
+#: ../dgit:1820
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
-#: ../dgit:1844
+#: ../dgit:1857
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
-#: ../dgit:1890
+#: ../dgit:1903
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
-#: ../dgit:1901
+#: ../dgit:1914
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
-#: ../dgit:1947
+#: ../dgit:1960
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
-#: ../dgit:1956
+#: ../dgit:1969
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
-#: ../dgit:1960
+#: ../dgit:1973
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
-#: ../dgit:1966
+#: ../dgit:1979
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
-#: ../dgit:2006
+#: ../dgit:2019
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
-#: ../dgit:2019
+#: ../dgit:2032
msgid "cannot find section/priority from .changes Files field"
msgstr ""
-#: ../dgit:2032
+#: ../dgit:2045
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
-#: ../dgit:2048
+#: ../dgit:2061
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
-#: ../dgit:2053
+#: ../dgit:2066
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
-#: ../dgit:2061
+#: ../dgit:2074
#, perl-format
msgid "archive %s: %s"
msgstr ""
-#: ../dgit:2068
+#: ../dgit:2081
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
-#: ../dgit:2096
+#: ../dgit:2109
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
-#: ../dgit:2104
+#: ../dgit:2117
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
-#: ../dgit:2107
+#: ../dgit:2120
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
-#: ../dgit:2131
+#: ../dgit:2139
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
-#: ../dgit:2154
+#: ../dgit:2162
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
@@ -422,113 +419,108 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:2166
+#: ../dgit:2174
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
-#: ../dgit:2197
+#: ../dgit:2205
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
-#: ../dgit:2199
+#: ../dgit:2207
msgid "(base) distro being accessed"
msgstr ""
-#: ../dgit:2201
+#: ../dgit:2209
msgid "(nominal) distro being accessed"
msgstr ""
-#: ../dgit:2206
+#: ../dgit:2214
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
-#: ../dgit:2231
+#: ../dgit:2239
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
-#: ../dgit:2235
+#: ../dgit:2243
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
-#: ../dgit:2237
+#: ../dgit:2245
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
-#: ../dgit:2240
+#: ../dgit:2248
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
-#: ../dgit:2249
+#: ../dgit:2257
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
-#: ../dgit:2253
+#: ../dgit:2261
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
-#: ../dgit:2256
+#: ../dgit:2264
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
-#: ../dgit:2262
+#: ../dgit:2270
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
-#: ../dgit:2294 ../dgit:2299
-#, perl-format
-msgid "accessing %s: %s"
-msgstr ""
-
-#: ../dgit:2314 ../dgit:2321
-#, perl-format
-msgid "saving %s: %s"
-msgstr ""
-
-#: ../dgit:2386
+#: ../dgit:2341
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
-#: ../dgit:2450 ../dgit:5974
-msgid "source package"
-msgstr ""
-
-#: ../dgit:2468
+#: ../dgit:2403
msgid "package changelog"
msgstr ""
-#: ../dgit:2508
+#: ../dgit:2443
msgid "package changelog has no entries!"
msgstr ""
-#: ../dgit:2527
+#: ../dgit:2512 ../dgit:2517
#, perl-format
-msgid "Import %s"
+msgid "accessing %s: %s"
+msgstr ""
+
+#: ../dgit:2532 ../dgit:2539
+#, perl-format
+msgid "saving %s: %s"
+msgstr ""
+
+#: ../dgit:2565 ../dgit:6037
+msgid "source package"
msgstr ""
-#: ../dgit:2608
+#: ../dgit:2643
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
-#: ../dgit:2627
+#: ../dgit:2662
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
-#: ../dgit:2636
+#: ../dgit:2671
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
@@ -537,21 +529,16 @@ msgid ""
" dpkg-source --before-build gave tree %s\n"
msgstr ""
-#: ../dgit:2651
+#: ../dgit:2686
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
-#: ../dgit:2655
+#: ../dgit:2690
msgid "Import of source package"
msgstr ""
-#: ../dgit:2668
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr ""
-
-#: ../dgit:2672
+#: ../dgit:2710
#, perl-format
msgid ""
"\n"
@@ -560,51 +547,51 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:2714
+#: ../dgit:2752
#, perl-format
msgid "using existing %s"
msgstr ""
-#: ../dgit:2718
+#: ../dgit:2756
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
-#: ../dgit:2722
+#: ../dgit:2760
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
-#: ../dgit:2738
+#: ../dgit:2776
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
-#: ../dgit:2833
+#: ../dgit:2871
msgid "too many iterations trying to get sane fetch!"
msgstr ""
-#: ../dgit:2848
+#: ../dgit:2886
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
-#: ../dgit:2892
+#: ../dgit:2930
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
-#: ../dgit:2907
+#: ../dgit:2945
msgid ""
"--dry-run specified but we actually wanted the results of git fetch,\n"
"so this is not going to work. Try running dgit fetch first,\n"
"or using --damp-run instead of --dry-run.\n"
msgstr ""
-#: ../dgit:2912
+#: ../dgit:2950
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
@@ -614,49 +601,24 @@ msgid ""
"warning: Will try again...\n"
msgstr ""
-#: ../dgit:2979
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr ""
-
-#: ../dgit:3028
-#, perl-format
-msgid "%s: NO git hash"
-msgstr ""
-
-#: ../dgit:3032
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr ""
-
-#: ../dgit:3039
-#, perl-format
-msgid "%s: specified git hash"
-msgstr ""
-
-#: ../dgit:3041
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr ""
-
-#: ../dgit:3063
+#: ../dgit:3097
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
-#: ../dgit:3068
+#: ../dgit:3102
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
-#: ../dgit:3073
+#: ../dgit:3107
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
"for which we have no configured url and .dsc provides no hint\n"
msgstr ""
-#: ../dgit:3083
+#: ../dgit:3117
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@ -665,54 +627,54 @@ msgid ""
"(can be overridden by config - consult documentation)\n"
msgstr ""
-#: ../dgit:3103
+#: ../dgit:3137
msgid "rewrite map"
msgstr ""
-#: ../dgit:3110
+#: ../dgit:3144
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
-#: ../dgit:3114
+#: ../dgit:3148
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
-#: ../dgit:3116
+#: ../dgit:3150
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
-#: ../dgit:3123
+#: ../dgit:3157
msgid "additional commits"
msgstr ""
-#: ../dgit:3126
+#: ../dgit:3160
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
-#: ../dgit:3151
+#: ../dgit:3185
msgid "last upload to archive"
msgstr ""
-#: ../dgit:3155
+#: ../dgit:3189
msgid "no version available from the archive"
msgstr ""
-#: ../dgit:3238
+#: ../dgit:3272
msgid "dgit suite branch on dgit git server"
msgstr ""
-#: ../dgit:3245
+#: ../dgit:3279
msgid "dgit client's archive history view"
msgstr ""
-#: ../dgit:3250
+#: ../dgit:3284
msgid "Dgit field in .dsc from archive"
msgstr ""
-#: ../dgit:3278
+#: ../dgit:3312
#, perl-format
msgid ""
"\n"
@@ -722,15 +684,15 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:3291
+#: ../dgit:3325
msgid "archive .dsc names newer git commit"
msgstr ""
-#: ../dgit:3294
+#: ../dgit:3328
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
-#: ../dgit:3315
+#: ../dgit:3349
#, perl-format
msgid ""
"\n"
@@ -738,7 +700,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:3324
+#: ../dgit:3358
#, perl-format
msgid ""
"\n"
@@ -748,7 +710,7 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3409
+#: ../dgit:3443
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
@@ -756,19 +718,19 @@ msgid ""
"Record that\n"
msgstr ""
-#: ../dgit:3422
+#: ../dgit:3456
msgid "should be treated as descended from\n"
msgstr ""
-#: ../dgit:3440
+#: ../dgit:3474
msgid "dgit repo server tip (last push)"
msgstr ""
-#: ../dgit:3442
+#: ../dgit:3476
msgid "local tracking tip (last fetch)"
msgstr ""
-#: ../dgit:3453
+#: ../dgit:3487
#, perl-format
msgid ""
"\n"
@@ -778,30 +740,30 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3468
+#: ../dgit:3502
msgid "fetched source tree"
msgstr ""
-#: ../dgit:3504
+#: ../dgit:3538
msgid "debian/changelog merge driver"
msgstr ""
-#: ../dgit:3569
+#: ../dgit:3603
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
-#: ../dgit:3583
+#: ../dgit:3617
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
-#: ../dgit:3598
+#: ../dgit:3632
#, perl-format
msgid "install %s: %s"
msgstr ""
-#: ../dgit:3625
+#: ../dgit:3659
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
@@ -809,30 +771,30 @@ msgid ""
"tree.\n"
msgstr ""
-#: ../dgit:3647
+#: ../dgit:3681
#, perl-format
msgid "fetching %s..."
msgstr ""
-#: ../dgit:3655
+#: ../dgit:3689
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
-#: ../dgit:3694
+#: ../dgit:3728
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
-#: ../dgit:3726
+#: ../dgit:3760
msgid "local combined tracking branch"
msgstr ""
-#: ../dgit:3728
+#: ../dgit:3762
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
-#: ../dgit:3767
+#: ../dgit:3801
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
@@ -840,7 +802,7 @@ msgid ""
"Input branches:\n"
msgstr ""
-#: ../dgit:3781
+#: ../dgit:3815
msgid ""
"\n"
"Key\n"
@@ -849,613 +811,257 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3796
+#: ../dgit:3830
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
-#: ../dgit:3814
+#: ../dgit:3848
#, perl-format
msgid "ready for work in %s"
msgstr ""
-#: ../dgit:3822
+#: ../dgit:3866
msgid "dry run makes no sense with clone"
msgstr ""
-#: ../dgit:3837
+#: ../dgit:3881
#, perl-format
msgid "create `%s': %s"
msgstr ""
-#: ../dgit:3853
+#: ../dgit:3893
msgid "fetching existing git history"
msgstr ""
-#: ../dgit:3857
+#: ../dgit:3896
msgid "starting new git history"
msgstr ""
-#: ../dgit:3883
+#: ../dgit:3921
#, perl-format
msgid ""
"FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
" Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n"
msgstr ""
-#: ../dgit:3888
+#: ../dgit:3926
#, perl-format
msgid "fetched into %s"
msgstr ""
-#: ../dgit:3900
+#: ../dgit:3938
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
-#: ../dgit:3902
+#: ../dgit:3940
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
-#: ../dgit:3910
+#: ../dgit:3948
#, perl-format
msgid "git tree contains %s"
msgstr ""
-#: ../dgit:3921
+#: ../dgit:3959
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
-#: ../dgit:3940
+#: ../dgit:3978
#, perl-format
msgid ""
"quilt fixup required but quilt mode is `nofix'\n"
"HEAD commit%s differs from tree implied by debian/patches%s"
msgstr ""
-#: ../dgit:3957
+#: ../dgit:3995
msgid "nothing quilty to commit, ok."
msgstr ""
-#: ../dgit:3960
+#: ../dgit:3998
msgid " (wanted to commit patch update)"
msgstr ""
-#: ../dgit:3964
+#: ../dgit:4002
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
-#: ../dgit:4007
+#: ../dgit:4046
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
-#: ../dgit:4012
+#: ../dgit:4051
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
-#: ../dgit:4022
+#: ../dgit:4061
#, perl-format
msgid "commit id %s"
msgstr ""
-#: ../dgit:4028
+#: ../dgit:4067
#, perl-format
msgid "and left in %s"
msgstr ""
-#: ../dgit:4054
+#: ../dgit:4093
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4057
+#: ../dgit:4096
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4065
+#: ../dgit:4104
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
-#: ../dgit:4074
+#: ../dgit:4113
msgid "version currently in archive"
msgstr ""
-#: ../dgit:4083
+#: ../dgit:4122
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
-#: ../dgit:4091
+#: ../dgit:4130
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
-#: ../dgit:4101
+#: ../dgit:4141
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
-#: ../dgit:4104
+#: ../dgit:4144
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
-#: ../dgit:4118
+#: ../dgit:4158
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
-#: ../dgit:4174
+#: ../dgit:4214
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
-#: ../dgit:4183
+#: ../dgit:4223
msgid "maintainer view tag"
msgstr ""
-#: ../dgit:4185
+#: ../dgit:4225
msgid "dgit view tag"
msgstr ""
-#: ../dgit:4186
+#: ../dgit:4226
msgid "current archive contents"
msgstr ""
-#: ../dgit:4199
+#: ../dgit:4239
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
-#: ../dgit:4209
+#: ../dgit:4249
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
-#: ../dgit:4210
+#: ../dgit:4250
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
-#: ../dgit:4214
+#: ../dgit:4254
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
-#: ../dgit:4227
+#: ../dgit:4267
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
-#: ../dgit:4235
+#: ../dgit:4275
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
-#: ../dgit:4247
+#: ../dgit:4287
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
-#: ../dgit:4269
+#: ../dgit:4309
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
-#: ../dgit:4330
+#: ../dgit:4363
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
-#: ../dgit:4358
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr ""
-
-#: ../dgit:4371
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4423
-msgid ""
-"Push failed, while checking state of the archive.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4432
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-
-#: ../dgit:4437
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4460
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr ""
-
-#: ../dgit:4477
-#, perl-format
-msgid ""
-"Branch is managed by git-debrebase (%s\n"
-"exists), but quilt mode (%s) implies a split view.\n"
-"Pass the right --quilt option or adjust your git config.\n"
-"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
-msgstr ""
-
-#: ../dgit:4501
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-
-#: ../dgit:4532
-msgid ""
-"dgit push: HEAD is not a descendant of the archive's version.\n"
-"To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
-"To rewind history, if permitted by the archive, use --deliberately-not-fast-"
-"forward."
-msgstr ""
-
-#: ../dgit:4542
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr ""
-
-#: ../dgit:4576 ../dgit:4588
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr ""
-
-#: ../dgit:4582
-#, perl-format
-msgid ""
-"There is a problem with your source tree (see dgit(7) for some hints).\n"
-"To see a full diff, run git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4592
-#, perl-format
-msgid ""
-"Perhaps you forgot to build. Or perhaps there is a problem with your\n"
-" source tree (see dgit(7) for some hints). To see a full diff, run\n"
-" git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4603
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-
-#: ../dgit:4625
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-
-#: ../dgit:4629
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-
-#: ../dgit:4633
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-
-#: ../dgit:4640
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr ""
-
-#: ../dgit:4684
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4697
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4714
-msgid ""
-"Push failed, while updating the remote git repository - see messages above.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4731
-msgid ""
-"Push failed, while obtaining signatures on the .changes and .dsc.\n"
-"If it was just that the signature failed, you may try again by using\n"
-"debsign by hand to sign the changes file (see the command dgit tried,\n"
-"above), and then dput that changes file to complete the upload.\n"
-"If you need to change the package, you must use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4762
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr ""
-
-#: ../dgit:4774
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-
-#: ../dgit:4785
-msgid "incorrect arguments to dgit clone"
-msgstr ""
-
-#: ../dgit:4791 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr ""
-
-#: ../dgit:4805
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4809
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4847
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr ""
-
-#: ../dgit:4864
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4873
-msgid "dgit checkout needs a suite argument"
-msgstr ""
-
-#: ../dgit:4935
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr ""
-
-#: ../dgit:4938
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr ""
-
-#: ../dgit:4940
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr ""
-
-#: ../dgit:4945
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr ""
-
-#: ../dgit:4960
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr ""
-
-#: ../dgit:4971
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-
-#: ../dgit:5009
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-
-#: ../dgit:5089
-#, perl-format
-msgid "create %s: %s"
-msgstr ""
-
-#: ../dgit:5126
-#, perl-format
-msgid "build host child failed: %s"
-msgstr ""
-
-#: ../dgit:5129
-msgid "all done\n"
-msgstr ""
-
-#: ../dgit:5138
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr ""
-
-#: ../dgit:5146
-msgid "bad param spec"
-msgstr ""
-
-#: ../dgit:5152
-msgid "bad previously spec"
-msgstr ""
-
-#: ../dgit:5171
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-
-#: ../dgit:5216
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr ""
-
-#: ../dgit:5219
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr ""
-
-#: ../dgit:5260
-msgid "remote changes file"
-msgstr ""
-
-#: ../dgit:5335
-msgid "not a plain file or symlink\n"
-msgstr ""
-
-#: ../dgit:5341
-msgid "mode or type changed\n"
-msgstr ""
-
-#: ../dgit:5342
-msgid "modified symlink\n"
-msgstr ""
-
-#: ../dgit:5345
-msgid "deletion of symlink\n"
-msgstr ""
-
-#: ../dgit:5349
-msgid "creation with non-default mode\n"
-msgstr ""
-
-#: ../dgit:5379
-msgid "dgit view: changes are required..."
-msgstr ""
-
-#: ../dgit:5408
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-
-#: ../dgit:5415
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-
-#: ../dgit:5421
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-
-#: ../dgit:5428
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-applied git tree\n"
-" but git tree differs from result of applying debian/patches to upstream\n"
-msgstr ""
-
-#: ../dgit:5435
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-
-#: ../dgit:5444
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying that HEAD is for use with a\n"
-" tool which does not create patches for changes to upstream\n"
-" .gitignores: but, such patches exist in debian/patches.\n"
-msgstr ""
-
-#: ../dgit:5453
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-
-#: ../dgit:5458
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-
-#: ../dgit:5463
-msgid ""
-"Subject: Update .gitignore from Debian packaging branch\n"
-"\n"
-"The Debian packaging git branch contains these updates to the upstream\n"
-".gitignore file(s). This patch is autogenerated, to provide these\n"
-"updates to users of the official Debian archive view of the package.\n"
-msgstr ""
-
-#: ../dgit:5485
-msgid "Commit patch to update .gitignore\n"
-msgstr ""
-
-#: ../dgit:5499
-msgid "converted"
-msgstr ""
-
-#: ../dgit:5500
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr ""
-
-#: ../dgit:5565
+#: ../dgit:5609
msgid "maximum search space exceeded"
msgstr ""
-#: ../dgit:5583
+#: ../dgit:5627
#, perl-format
msgid "has %s not %s"
msgstr ""
-#: ../dgit:5592
+#: ../dgit:5636
msgid "root commit"
msgstr ""
-#: ../dgit:5598
+#: ../dgit:5642
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
-#: ../dgit:5610
+#: ../dgit:5654
#, perl-format
msgid "changed %s"
msgstr ""
-#: ../dgit:5629
+#: ../dgit:5673
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
-#: ../dgit:5636
+#: ../dgit:5680
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
-#: ../dgit:5648
+#: ../dgit:5692
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
-#: ../dgit:5651
+#: ../dgit:5695
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
-#: ../dgit:5663
+#: ../dgit:5707
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
@@ -1463,68 +1069,84 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:5670
+#: ../dgit:5714
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
-#: ../dgit:5704
+#: ../dgit:5748
msgid "contains unexpected slashes\n"
msgstr ""
-#: ../dgit:5705
+#: ../dgit:5749
msgid "contains leading punctuation\n"
msgstr ""
-#: ../dgit:5706
+#: ../dgit:5750
msgid "contains bad character(s)\n"
msgstr ""
-#: ../dgit:5707
+#: ../dgit:5751
msgid "is series file\n"
msgstr ""
-#: ../dgit:5708
+#: ../dgit:5752
msgid "too long\n"
msgstr ""
-#: ../dgit:5712
+#: ../dgit:5756
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
-#: ../dgit:5741
+#: ../dgit:5785
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
-#: ../dgit:5884
+#: ../dgit:5868
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
+#: ../dgit:5886
+msgid "converted"
+msgstr ""
+
+#: ../dgit:5887
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr ""
+
+#: ../dgit:5941
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
-#: ../dgit:5894
+#: ../dgit:5951
msgid "starting quiltify (single-debian-patch)"
msgstr ""
-#: ../dgit:5996
+#: ../dgit:6061
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
-#: ../dgit:6027
+#: ../dgit:6093
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
-#: ../dgit:6032
+#: ../dgit:6098
msgid "dgit view: found cached, no changes required"
msgstr ""
-#: ../dgit:6043
+#: ../dgit:6133
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6134
+#: ../dgit:6247
msgid ""
"failed to apply your git tree's patch stack (from debian/patches/) to\n"
" the corresponding upstream tarball(s). Your source tree and .orig\n"
@@ -1532,58 +1154,84 @@ msgid ""
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
-#: ../dgit:6148
+#: ../dgit:6261
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
-#: ../dgit:6185
+#: ../dgit:6295
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6308
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6326
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6342
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6356
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6380
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
-#: ../dgit:6188
+#: ../dgit:6390
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
-"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
+"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
-#: ../dgit:6194
+#: ../dgit:6399
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
-#: ../dgit:6198
+#: ../dgit:6403
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
-#: ../dgit:6205
+#: ../dgit:6410
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6414
msgid "This might be a patches-unapplied branch."
msgstr ""
-#: ../dgit:6208
+#: ../dgit:6417
msgid "This might be a patches-applied branch."
msgstr ""
-#: ../dgit:6211
+#: ../dgit:6420
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
-#: ../dgit:6214
+#: ../dgit:6423
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
-#: ../dgit:6218
+#: ../dgit:6427
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
-#: ../dgit:6227
+#: ../dgit:6438
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6265
+#: ../dgit:6477
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@ -1592,102 +1240,124 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:6277
+#: ../dgit:6489
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
-#: ../dgit:6306
+#: ../dgit:6518
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
"or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
msgstr ""
-#: ../dgit:6318
+#: ../dgit:6530
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
-#: ../dgit:6321
+#: ../dgit:6533
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
-#: ../dgit:6324
+#: ../dgit:6536
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
-#: ../dgit:6342
+#: ../dgit:6549
+#, perl-format
+msgid ""
+"quilt mode %s (generally needs untracked upstream files)\n"
+"contradicts clean mode %s (which would delete them)\n"
+msgstr ""
+
+#: ../dgit:6566
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
-#: ../dgit:6356
+#: ../dgit:6580
msgid "clean takes no additional arguments"
msgstr ""
-#: ../dgit:6369
+#: ../dgit:6599
#, perl-format
-msgid "-p is not allowed with dgit %s"
+msgid "-p specified package %s, but changelog says %s"
msgstr ""
-#: ../dgit:6408
+#: ../dgit:6609
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+
+#: ../dgit:6618
+#, perl-format
+msgid "dgit: --quilt=%s, %s"
+msgstr ""
+
+#: ../dgit:6622
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
+msgstr ""
+
+#: ../dgit:6657
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
-#: ../dgit:6410
+#: ../dgit:6659
#, perl-format
msgid "would remove %s"
msgstr ""
-#: ../dgit:6436
+#: ../dgit:6685
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
-#: ../dgit:6442
+#: ../dgit:6691
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
-#: ../dgit:6445
+#: ../dgit:6694
msgid "package seems new, not specifying -v<version>"
msgstr ""
-#: ../dgit:6488
+#: ../dgit:6737
msgid "Wanted to build nothing!"
msgstr ""
-#: ../dgit:6526
+#: ../dgit:6775
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
-#: ../dgit:6533
+#: ../dgit:6782
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
-#: ../dgit:6540
+#: ../dgit:6789
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
-#: ../dgit:6544
+#: ../dgit:6793
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
-#: ../dgit:6549
+#: ../dgit:6798
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
-#: ../dgit:6552
+#: ../dgit:6801
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
-#: ../dgit:6565
+#: ../dgit:6814
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
@@ -1695,136 +1365,136 @@ msgid ""
"Suggest you delete %s.\n"
msgstr ""
-#: ../dgit:6583
+#: ../dgit:6832
msgid "build successful\n"
msgstr ""
-#: ../dgit:6590
+#: ../dgit:6839
#, perl-format
msgid ""
"%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
"%s: warning: build-products-dir will be ignored; files will go to ..\n"
msgstr ""
-#: ../dgit:6700
+#: ../dgit:6949
#, perl-format
msgid "remove %s: %s"
msgstr ""
-#: ../dgit:6735
+#: ../dgit:6986
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
-#: ../dgit:6755
+#: ../dgit:7006
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
-#: ../dgit:6768
+#: ../dgit:7019
msgid "build-source takes no additional arguments"
msgstr ""
-#: ../dgit:6772
+#: ../dgit:7023
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
-#: ../dgit:6779
+#: ../dgit:7030
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
-#: ../dgit:6785
+#: ../dgit:7036
msgid "source changes file"
msgstr ""
-#: ../dgit:6787
+#: ../dgit:7038
msgid "user-specified changes file is not source-only"
msgstr ""
-#: ../dgit:6807 ../dgit:6809
+#: ../dgit:7058 ../dgit:7060
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
-#: ../dgit:6822
+#: ../dgit:7073
msgid ""
"perhaps you need to pass -A ? (sbuild's default is to build only\n"
"arch-specific binaries; dgit 1.4 used to override that.)\n"
msgstr ""
-#: ../dgit:6834
+#: ../dgit:7085
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
-#: ../dgit:6838
+#: ../dgit:7089
msgid ""
"we must build a .dsc to pass to the builder but your debbuiltopts forbids "
"the building of a source package; cannot continue"
msgstr ""
-#: ../dgit:6868
+#: ../dgit:7119
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
-#: ../dgit:6890
+#: ../dgit:7140
msgid "source tree"
msgstr ""
-#: ../dgit:6892
+#: ../dgit:7142
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
-#: ../dgit:6905
+#: ../dgit:7155
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
-#: ../dgit:6909
+#: ../dgit:7159
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
-#: ../dgit:6913
+#: ../dgit:7163
msgid "dry run makes no sense with import-dsc"
msgstr ""
-#: ../dgit:6930
+#: ../dgit:7180
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
-#: ../dgit:6935
+#: ../dgit:7185
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
-#: ../dgit:6937
+#: ../dgit:7187
#, perl-format
msgid "read %s: %s"
msgstr ""
-#: ../dgit:6948
+#: ../dgit:7198
msgid "import-dsc signature check failed"
msgstr ""
-#: ../dgit:6951
+#: ../dgit:7201
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
-#: ../dgit:6962
+#: ../dgit:7212
msgid "Dgit metadata in .dsc"
msgstr ""
-#: ../dgit:6973
+#: ../dgit:7223
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
-#: ../dgit:6982
+#: ../dgit:7232
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
@@ -1832,21 +1502,21 @@ msgid ""
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
-#: ../dgit:6989
+#: ../dgit:7239
msgid "Not fast forward, forced update."
msgstr ""
-#: ../dgit:6991
+#: ../dgit:7241
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
-#: ../dgit:6996
+#: ../dgit:7246
#, perl-format
msgid "updated git ref %s"
msgstr ""
-#: ../dgit:7001
+#: ../dgit:7251
#, perl-format
msgid ""
"Branch %s already exists\n"
@@ -1854,134 +1524,129 @@ msgid ""
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
-#: ../dgit:7021
+#: ../dgit:7271
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
-#: ../dgit:7023
+#: ../dgit:7273
#, perl-format
msgid "stat %s: %s"
msgstr ""
-#: ../dgit:7031
+#: ../dgit:7281
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
-#: ../dgit:7050
+#: ../dgit:7300
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
-#: ../dgit:7054
+#: ../dgit:7304
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
-#: ../dgit:7055
+#: ../dgit:7305
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
-#: ../dgit:7066
+#: ../dgit:7316
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
-#: ../dgit:7068
+#: ../dgit:7318
msgid "Import, merging."
msgstr ""
-#: ../dgit:7082
+#: ../dgit:7332
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
-#: ../dgit:7091
+#: ../dgit:7341
#, perl-format
msgid "results are in git ref %s"
msgstr ""
-#: ../dgit:7098
+#: ../dgit:7348
msgid "need only 1 subpath argument"
msgstr ""
-#: ../dgit:7104
-#, perl-format
-msgid "exec curl: %s\n"
-msgstr ""
-
-#: ../dgit:7118
+#: ../dgit:7366
msgid "need destination argument"
msgstr ""
-#: ../dgit:7123
+#: ../dgit:7371
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
-#: ../dgit:7131
+#: ../dgit:7379
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
-#: ../dgit:7142
+#: ../dgit:7390
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
-#: ../dgit:7148
+#: ../dgit:7396
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
-#: ../dgit:7155 ../dgit:7161
+#: ../dgit:7403 ../dgit:7409
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
-#: ../dgit:7167
+#: ../dgit:7415
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
-#: ../dgit:7214
+#: ../dgit:7462
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
-#: ../dgit:7253
+#: ../dgit:7501
#, perl-format
msgid "%s needs a value"
msgstr ""
-#: ../dgit:7257
+#: ../dgit:7505
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
-#: ../dgit:7348
+#: ../dgit:7605
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
-#: ../dgit:7368
+#: ../dgit:7623
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
-#: ../dgit:7423
+#: ../dgit:7678
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
-#: ../dgit:7438
+#: ../dgit:7693
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
-#: ../dgit:7442
+#: ../dgit:7697
#, perl-format
msgid "%s is blocked\n"
msgstr ""
-#: ../dgit:7448
+#: ../dgit:7703
#, perl-format
msgid ""
"On entry to dgit, %s\n"
@@ -1989,49 +1654,40 @@ msgid ""
"Giving up.\n"
msgstr ""
-#: ../dgit:7465
+#: ../dgit:7720
#, perl-format
msgid "cannot set command for %s"
msgstr ""
-#: ../dgit:7478
+#: ../dgit:7733
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
-#: ../dgit:7498
+#: ../dgit:7753
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
-#: ../dgit:7508
+#: ../dgit:7764
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
-#: ../dgit:7513
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-
-#: ../dgit:7524
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr ""
-
-#: ../dgit:7545
+#: ../dgit:7792
msgid "DRY RUN ONLY\n"
msgstr ""
-#: ../dgit:7546
+#: ../dgit:7793
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
-#: ../dgit:7565
+#: ../dgit:7812
#, perl-format
msgid "unknown operation %s"
msgstr ""
-#: ../git-debrebase:44
+#: ../git-debrebase:45
msgid ""
"usages:\n"
" git-debrebase [<options>] [--|-i <git rebase options...>]\n"
@@ -2044,60 +1700,60 @@ msgid ""
"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
msgstr ""
-#: ../git-debrebase:67
+#: ../git-debrebase:68
#, perl-format
msgid "%s: bad usage: %s\n"
msgstr ""
-#: ../git-debrebase:78
+#: ../git-debrebase:79
#, perl-format
msgid "bad options follow `git-debrebase %s'"
msgstr ""
-#: ../git-debrebase:89
+#: ../git-debrebase:90
#, perl-format
msgid "missing required git config %s"
msgstr ""
-#: ../git-debrebase:401
+#: ../git-debrebase:363
#, perl-format
msgid "%s: snag ignored (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:404
+#: ../git-debrebase:366
#, perl-format
msgid "%s: snag detected (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:417
+#: ../git-debrebase:379
#, perl-format
msgid "%s: snags: %d overriden by individual -f options\n"
msgstr ""
-#: ../git-debrebase:423
+#: ../git-debrebase:385
#, perl-format
msgid "%s: snags: %d overriden by global --force\n"
msgstr ""
-#: ../git-debrebase:427
+#: ../git-debrebase:389
#, perl-format
msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
msgstr ""
-#: ../git-debrebase:459
+#: ../git-debrebase:421
msgid ""
"Branch/history seems mangled - no longer in gdr format.\n"
"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
msgstr ""
-#: ../git-debrebase:466
+#: ../git-debrebase:428
#, perl-format
msgid ""
"%s\n"
"Is this meant to be a gdr branch? %s\n"
msgstr ""
-#: ../git-debrebase:471
+#: ../git-debrebase:433
#, perl-format
msgid ""
"%s\n"
@@ -2105,7 +1761,7 @@ msgid ""
"Consider git-debrebase scrap, to throw away your recent work.\n"
msgstr ""
-#: ../git-debrebase:477
+#: ../git-debrebase:439
#, perl-format
msgid ""
"%s\n"
@@ -2113,7 +1769,7 @@ msgid ""
"Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
msgstr ""
-#: ../git-debrebase:488
+#: ../git-debrebase:450
#, perl-format
msgid ""
"%s\n"
@@ -2121,418 +1777,415 @@ msgid ""
"Maybe you reset to, or rebased from, somewhere inappropriate.\n"
msgstr ""
-#: ../git-debrebase:935
+#: ../git-debrebase:897
#, perl-format
msgid "git-debrebase `anchor' but %s"
msgstr ""
-#: ../git-debrebase:937
+#: ../git-debrebase:899
msgid "has other than two parents"
msgstr ""
-#: ../git-debrebase:938
+#: ../git-debrebase:900
msgid "contains debian/patches"
msgstr ""
-#: ../git-debrebase:964
+#: ../git-debrebase:926
msgid "is an origin commit"
msgstr ""
-#: ../git-debrebase:966
+#: ../git-debrebase:928
msgid "upstream files differ from left parent"
msgstr ""
-#: ../git-debrebase:968
+#: ../git-debrebase:930
msgid "debian/ differs from right parent"
msgstr ""
-#: ../git-debrebase:979
+#: ../git-debrebase:941
msgid "edits debian/patches"
msgstr ""
-#: ../git-debrebase:991
+#: ../git-debrebase:953
msgid "parent's debian is not a directory"
msgstr ""
-#: ../git-debrebase:998
+#: ../git-debrebase:960
msgid "no changes"
msgstr ""
-#: ../git-debrebase:1004
+#: ../git-debrebase:966
msgid "origin commit"
msgstr ""
-#: ../git-debrebase:1055
+#: ../git-debrebase:1017
#, perl-format
msgid "unknown kind of merge from %s"
msgstr ""
-#: ../git-debrebase:1058
+#: ../git-debrebase:1020
msgid "octopus merge"
msgstr ""
-#: ../git-debrebase:1062
+#: ../git-debrebase:1024
msgid "general two-parent merge"
msgstr ""
-#: ../git-debrebase:1079
+#: ../git-debrebase:1041
#, perl-format
msgid "inconsistent anchors in merged-breakwaters %s"
msgstr ""
-#: ../git-debrebase:1119
+#: ../git-debrebase:1081
#, perl-format
msgid "branch needs laundering (run git-debrebase): %s"
msgstr ""
-#: ../git-debrebase:1147
+#: ../git-debrebase:1109
#, perl-format
msgid "packaging change (%s) follows upstream change"
msgstr ""
-#: ../git-debrebase:1148
+#: ../git-debrebase:1110
#, perl-format
msgid " (eg %s)"
msgstr ""
-#: ../git-debrebase:1154
+#: ../git-debrebase:1116
msgid "found mixed upstream/packaging commit"
msgstr ""
-#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
-#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130
+#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149
#, perl-format
msgid " (%s)"
msgstr ""
-#: ../git-debrebase:1162
+#: ../git-debrebase:1124
#, perl-format
msgid "found interchange bureaucracy commit (%s)"
msgstr ""
-#: ../git-debrebase:1167
+#: ../git-debrebase:1129
msgid "found dgit dsc import"
msgstr ""
-#: ../git-debrebase:1172
+#: ../git-debrebase:1134
msgid "found bare dgit dsc import with no prior history"
msgstr ""
-#: ../git-debrebase:1178
+#: ../git-debrebase:1140
msgid "found vanilla merge"
msgstr ""
-#: ../git-debrebase:1185
+#: ../git-debrebase:1147
#, perl-format
msgid "found unprocessable commit, cannot cope: %s"
msgstr ""
-#: ../git-debrebase:1253
+#: ../git-debrebase:1215
#, perl-format
msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1254
+#: ../git-debrebase:1216
#, perl-format
msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1375
+#: ../git-debrebase:1337
msgid "bare dgit dsc import"
msgstr ""
-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1677 ../git-debrebase:1680
#, perl-format
msgid "mismatch %s ?"
msgstr ""
-#: ../git-debrebase:1721
+#: ../git-debrebase:1683
#, perl-format
msgid "mismatch %s != %s ?"
msgstr ""
-#: ../git-debrebase:1731
+#: ../git-debrebase:1693
#, perl-format
msgid "internal error %#x %s %s"
msgstr ""
-#: ../git-debrebase:1759
+#: ../git-debrebase:1721
#, perl-format
msgid "%s: laundered (head was %s)\n"
msgstr ""
-#: ../git-debrebase:1773
+#: ../git-debrebase:1735
msgid "you are in the middle of a git-rebase already"
msgstr ""
-#: ../git-debrebase:1799
+#: ../git-debrebase:1761
msgid "launder for rebase"
msgstr ""
-#: ../git-debrebase:1804
+#: ../git-debrebase:1766
msgid "analyse does not support any options"
msgstr ""
-#: ../git-debrebase:1806
+#: ../git-debrebase:1768
msgid "too many arguments to analyse"
msgstr ""
-#: ../git-debrebase:1841
+#: ../git-debrebase:1801
+#, perl-format
+msgid "%s already exists"
+msgstr ""
+
+#: ../git-debrebase:1803
msgid "HEAD symref is not to refs/heads/"
msgstr ""
-#: ../git-debrebase:1864
+#: ../git-debrebase:1826
#, perl-format
msgid "OK, you are ahead of %s\n"
msgstr ""
-#: ../git-debrebase:1868
+#: ../git-debrebase:1830
#, perl-format
msgid "you are behind %s, divergence risk"
msgstr ""
-#: ../git-debrebase:1872
+#: ../git-debrebase:1834
#, perl-format
msgid "you have diverged from %s"
msgstr ""
-#: ../git-debrebase:1894
+#: ../git-debrebase:1856
msgid "remote dgit branch"
msgstr ""
-#: ../git-debrebase:1897
+#: ../git-debrebase:1859
msgid "remote dgit branch for sid"
msgstr ""
-#: ../git-debrebase:1925
+#: ../git-debrebase:1887
msgid "Recorded previous head for preservation"
msgstr ""
-#: ../git-debrebase:1933
+#: ../git-debrebase:1895
#, perl-format
msgid "could not record ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1944
+#: ../git-debrebase:1906
#, perl-format
msgid "could not check ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1964
+#: ../git-debrebase:1926
msgid "fast forward"
msgstr ""
-#: ../git-debrebase:1974
+#: ../git-debrebase:1936
msgid "Declare fast forward / record previous work"
msgstr ""
-#: ../git-debrebase:1986
+#: ../git-debrebase:1948
msgid "No ffq-prev to stitch."
msgstr ""
-#: ../git-debrebase:2017
-#, perl-format
-msgid ""
-"Could not determine appropriate upstream commitish.\n"
-" (Tried these tags: %s)\n"
-" Check version, and specify upstream commitish explicitly."
-msgstr ""
-
-#: ../git-debrebase:2036
+#: ../git-debrebase:1965
msgid "need NEW-VERSION [UPS-COMMITTISH]"
msgstr ""
-#: ../git-debrebase:2041
+#: ../git-debrebase:1970
#, perl-format
msgid "bad version number `%s'"
msgstr ""
-#: ../git-debrebase:2059
+#: ../git-debrebase:1988
#, perl-format
msgid "upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2060
+#: ../git-debrebase:1989
msgid "upstream (main piece"
msgstr ""
-#: ../git-debrebase:2080
+#: ../git-debrebase:2009
msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
msgstr ""
-#: ../git-debrebase:2098
+#: ../git-debrebase:2027
msgid "old anchor is recognised due to --anchor, cannot check upstream"
msgstr "old anchor is recognized due to --anchor, cannot check upstream"
-#: ../git-debrebase:2114
+#: ../git-debrebase:2043
#, perl-format
msgid ""
"previous upstream combine %s mentions %d pieces (each implying one parent) "
"but has %d parents (one per piece plus maybe a previous combine)"
msgstr ""
-#: ../git-debrebase:2123
+#: ../git-debrebase:2052
#, perl-format
msgid "previous upstream combine %s first piece is not `.'"
msgstr ""
-#: ../git-debrebase:2136
+#: ../git-debrebase:2065
#, perl-format
msgid ""
"previous upstream %s is from git-debrebase but not an `upstream-combine' "
"commit"
msgstr ""
-#: ../git-debrebase:2147
+#: ../git-debrebase:2076
#, perl-format
msgid "introducing upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2150
+#: ../git-debrebase:2079
#, perl-format
msgid "dropping upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2153
+#: ../git-debrebase:2082
#, perl-format
msgid "not fast forward: %s %s"
msgstr ""
-#: ../git-debrebase:2264
+#: ../git-debrebase:2193
msgid "Previous head already recorded\n"
msgstr ""
-#: ../git-debrebase:2268
+#: ../git-debrebase:2197
#, perl-format
msgid "Could not preserve: %s"
msgstr ""
-#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285
-#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408
-#: ../git-debrebase:2472
+#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214
+#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337
+#: ../git-debrebase:2401
msgid "no arguments allowed"
msgstr ""
-#: ../git-debrebase:2307
+#: ../git-debrebase:2236
msgid "branch contains furniture (not laundered)"
msgstr ""
-#: ../git-debrebase:2308
+#: ../git-debrebase:2237
msgid "branch is unlaundered"
msgstr ""
-#: ../git-debrebase:2309
+#: ../git-debrebase:2238
msgid "branch needs laundering"
msgstr ""
-#: ../git-debrebase:2310
+#: ../git-debrebase:2239
msgid "branch not in git-debrebase form"
msgstr ""
-#: ../git-debrebase:2320
+#: ../git-debrebase:2249
msgid "current branch contents, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2322
+#: ../git-debrebase:2251
msgid " branch is laundered\n"
msgstr ""
-#: ../git-debrebase:2338
+#: ../git-debrebase:2267
#, perl-format
msgid " %s is not well-defined\n"
msgstr ""
-#: ../git-debrebase:2344
+#: ../git-debrebase:2273
msgid "key git-debrebase commits:\n"
msgstr ""
-#: ../git-debrebase:2345
+#: ../git-debrebase:2274
msgid "anchor"
msgstr ""
-#: ../git-debrebase:2346
+#: ../git-debrebase:2275
msgid "breakwater"
msgstr ""
-#: ../git-debrebase:2351
+#: ../git-debrebase:2280
msgid "branch and ref status, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2358
+#: ../git-debrebase:2287
msgid " unstitched; previous tip was:\n"
msgstr ""
-#: ../git-debrebase:2361
+#: ../git-debrebase:2290
msgid " stitched? (no record of git-debrebase work)\n"
msgstr ""
-#: ../git-debrebase:2363
+#: ../git-debrebase:2292
msgid " stitched\n"
msgstr ""
-#: ../git-debrebase:2365
+#: ../git-debrebase:2294
msgid " not git-debrebase (diverged since last stitch)\n"
msgstr ""
-#: ../git-debrebase:2368
+#: ../git-debrebase:2297
msgid "you are currently rebasing\n"
msgstr ""
-#: ../git-debrebase:2385 ../git-debrebase:2398
+#: ../git-debrebase:2314 ../git-debrebase:2327
msgid "launder for git-debrebase quick"
msgstr ""
-#: ../git-debrebase:2392 ../git-debrebase:2422
+#: ../git-debrebase:2321 ../git-debrebase:2351
msgid "No ongoing git-debrebase session."
msgstr ""
-#: ../git-debrebase:2461
+#: ../git-debrebase:2390
msgid "Commit patch queue (exported by git-debrebase)"
msgstr ""
-#: ../git-debrebase:2478
+#: ../git-debrebase:2407
msgid "No (more) patches to export."
msgstr ""
-#: ../git-debrebase:2485
+#: ../git-debrebase:2414
#, perl-format
msgid ""
"Patch export produced patch amendments (abandoned output commit %s). Try "
"laundering first."
msgstr ""
-#: ../git-debrebase:2505
+#: ../git-debrebase:2434
#, perl-format
msgid "%s contains comments, which will be discarded"
msgstr ""
-#: ../git-debrebase:2510
+#: ../git-debrebase:2439
#, perl-format
msgid "patch %s repeated in %s !"
msgstr ""
-#: ../git-debrebase:2517
+#: ../git-debrebase:2446
#, perl-format
msgid "Unused patch file %s will be discarded"
msgstr ""
-#: ../git-debrebase:2525
+#: ../git-debrebase:2454
msgid "ffq-prev exists, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2530
+#: ../git-debrebase:2459
msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2546
+#: ../git-debrebase:2475
msgid "want only 1 optional argument, the upstream git commitish"
msgstr ""
-#: ../git-debrebase:2551
+#: ../git-debrebase:2480
msgid "missing Version from changelog\n"
msgstr ""
-#: ../git-debrebase:2567
+#: ../git-debrebase:2496
#, perl-format
msgid ""
"upstream (%s) and HEAD are not\n"
@@ -2540,58 +2193,58 @@ msgid ""
" git diff %s HEAD -- :!/debian :/\n"
msgstr ""
-#: ../git-debrebase:2575
+#: ../git-debrebase:2504
#, perl-format
msgid "upstream (%s) is not an ancestor of HEAD"
msgstr ""
-#: ../git-debrebase:2582
+#: ../git-debrebase:2511
#, perl-format
msgid ""
"history between upstream (%s) and HEAD contains direct changes to upstream "
"files - are you sure this is a gbp (patches-unapplied) branch?"
msgstr ""
-#: ../git-debrebase:2584
+#: ../git-debrebase:2513
#, perl-format
msgid "list expected changes with: %s\n"
msgstr ""
-#: ../git-debrebase:2591
+#: ../git-debrebase:2520
#, perl-format
msgid "upstream (%s) contains debian/ directory"
msgstr ""
-#: ../git-debrebase:2609
+#: ../git-debrebase:2538
msgid "neither of the first two changelog entries are released\n"
msgstr ""
-#: ../git-debrebase:2615
+#: ../git-debrebase:2544
#, perl-format
msgid "could not find suitable maintainer view tag %s\n"
msgstr ""
-#: ../git-debrebase:2618
+#: ../git-debrebase:2547
#, perl-format
msgid "HEAD is not FF from maintainer tag %s!"
msgstr ""
-#: ../git-debrebase:2621
+#: ../git-debrebase:2550
#, perl-format
msgid "dgit view tag %s not found\n"
msgstr ""
-#: ../git-debrebase:2623
+#: ../git-debrebase:2552
#, perl-format
msgid "dgit view tag %s is not FF from maintainer tag %s\n"
msgstr ""
-#: ../git-debrebase:2625
+#: ../git-debrebase:2554
#, perl-format
msgid "will stitch in dgit view, %s\n"
msgstr ""
-#: ../git-debrebase:2632
+#: ../git-debrebase:2561
#, perl-format
msgid ""
"Cannot confirm dgit view: %s\n"
@@ -2599,12 +2252,12 @@ msgid ""
"dgit --overwrite will be needed on the first dgit push after conversion.\n"
msgstr ""
-#: ../git-debrebase:2678
+#: ../git-debrebase:2607
#, perl-format
msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
msgstr ""
-#: ../git-debrebase:2707
+#: ../git-debrebase:2636
#, perl-format
msgid ""
"%s: converted to git-buildpackage branch format\n"
@@ -2612,16 +2265,16 @@ msgid ""
"%s: WARNING: doing so would drop all upstream patches!\n"
msgstr ""
-#: ../git-debrebase:2728
+#: ../git-debrebase:2657
msgid "takes 1 optional argument, the upstream commitish"
msgstr ""
-#: ../git-debrebase:2736
+#: ../git-debrebase:2665
#, perl-format
msgid "%s, from command line"
msgstr ""
-#: ../git-debrebase:2750
+#: ../git-debrebase:2679
#, perl-format
msgid ""
"%s: Branch already seems to be in git-debrebase format!\n"
@@ -2629,225 +2282,242 @@ msgid ""
"%s: but is probably a bad idea. Probably, you wanted to do nothing.\n"
msgstr ""
-#: ../git-debrebase:2754
+#: ../git-debrebase:2683
msgid "Branch already in git-debrebase format."
msgstr ""
-#: ../git-debrebase:2766
+#: ../git-debrebase:2695
msgid "Considering possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2773
+#: ../git-debrebase:2702
#, perl-format
msgid "git tag %s"
msgstr ""
-#: ../git-debrebase:2779
+#: ../git-debrebase:2708
#, perl-format
msgid " git tag: no suitable tag found (tried %s)\n"
msgstr ""
-#: ../git-debrebase:2788
+#: ../git-debrebase:2717
#, perl-format
msgid "opendir build-products-dir %s: %s"
msgstr ""
-#: ../git-debrebase:2794
+#: ../git-debrebase:2723
#, perl-format
msgid " orig: found what looks like a .orig, %s\n"
msgstr ""
-#: ../git-debrebase:2825
+#: ../git-debrebase:2754
#, perl-format
msgid " orig: no suitable origs found (looked for %s in %s)\n"
msgstr ""
-#: ../git-debrebase:2834
+#: ../git-debrebase:2763
msgid "Evaluating possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2871
+#: ../git-debrebase:2800
#, perl-format
msgid " %s: couldn't apply patches: gbp pq %s"
msgstr ""
-#: ../git-debrebase:2880
+#: ../git-debrebase:2809
#, perl-format
msgid " %s: applying patches gives different tree\n"
msgstr ""
-#: ../git-debrebase:2894
+#: ../git-debrebase:2823
msgid ""
"Could not find or construct a suitable upstream commit.\n"
"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
"upstream commmit explicitly or provide suitable origs.\n"
msgstr ""
-#: ../git-debrebase:2900
+#: ../git-debrebase:2829
#, perl-format
msgid "Yes, will base new branch on %s\n"
msgstr ""
-#: ../git-debrebase:2907
+#: ../git-debrebase:2836
msgid "forget-was-ever-debrebase takes no further arguments"
msgstr ""
-#: ../git-debrebase:2911
+#: ../git-debrebase:2840
#, perl-format
msgid "Not suitable for recording git-debrebaseness anyway: %s"
msgstr ""
-#: ../git-debrebase:3013
+#: ../git-debrebase:2942
msgid "bad options\n"
msgstr ""
-#: ../git-debrebase:3023
+#: ../git-debrebase:2952
#, perl-format
msgid "%s: no cuddling to -i for git-rebase"
msgstr ""
-#: ../git-debrebase:3053
+#: ../git-debrebase:2982
#, perl-format
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:296
#, perl-format
msgid "error: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:322
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:341
msgid "terminated, reporting successful completion"
msgstr ""
-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:343
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:346
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:350
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:356
msgid "failed command"
msgstr ""
-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:362
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:364
#, perl-format
msgid "subprocess %s"
msgstr ""
-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:366
msgid "subprocess produced invalid output"
msgstr ""
-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:457
msgid "stat source file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:467
msgid "stat destination file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:486
msgid "finally install file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:492
msgid "delete old file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:506
+#: ../Debian/Dgit.pm:513
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
-#: ../Debian/Dgit.pm:509
+#: ../Debian/Dgit.pm:516
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:624
msgid "git index contains changes (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:625
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:647
+msgid "using specified upstream commitish"
+msgstr ""
+
+#: ../Debian/Dgit.pm:653
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+
+#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:767
msgid "detached HEAD"
msgstr ""
-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:768
msgid "HEAD symref is not to refs/"
msgstr ""
-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:784
#, perl-format
msgid "parsing of %s failed"
msgstr ""
-#: ../Debian/Dgit.pm:715
+#: ../Debian/Dgit.pm:793
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
"modify the .dsc and then do the signature itself"
msgstr ""
-#: ../Debian/Dgit.pm:729
+#: ../Debian/Dgit.pm:807
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:828
#, perl-format
msgid "missing field %s in %s"
msgstr ""
-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:914
msgid "Dummy commit - do not use\n"
msgstr ""
-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:935
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1003
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1026
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1034
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1043
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
diff --git a/po/messages.pot b/po/messages.pot
index 69096f0..ee453df 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -6,32 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"#-#-#-#-# .dgit.pot (dgit ongoing) #-#-#-#-#\n"
"Project-Id-Version: dgit ongoing\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 21:54+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"
-"#-#-#-#-# .git-debrebase.pot (dgit ongoing) #-#-#-#-#\n"
-"Project-Id-Version: dgit ongoing\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 21:54+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"
-"#-#-#-#-# .common.pot (dgit ongoing) #-#-#-#-#\n"
-"Project-Id-Version: dgit ongoing\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 15:31+0000\n"
+"POT-Creation-Date: 2019-08-10 18:42+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"
@@ -40,78 +17,73 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../dgit:242
+#: ../dgit:265
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr ""
-#: ../dgit:249
+#: ../dgit:272
msgid "warning: overriding problem due to --force:\n"
msgstr ""
-#: ../dgit:257
+#: ../dgit:280
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
-#: ../dgit:262
+#: ../dgit:285
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr ""
-#: ../dgit:487
+#: ../dgit:517
#, perl-format
msgid "build host child %s"
msgstr ""
-#: ../dgit:492 ../dgit:498
+#: ../dgit:522 ../dgit:528
#, perl-format
msgid "connection lost: %s"
msgstr ""
-#: ../dgit:493
+#: ../dgit:523
#, perl-format
msgid "protocol violation; %s not expected"
msgstr ""
-#: ../dgit:501
+#: ../dgit:531
#, perl-format
msgid "eof (reading %s)"
msgstr ""
-#: ../dgit:508
+#: ../dgit:538
msgid "protocol message"
msgstr ""
-#: ../dgit:516
+#: ../dgit:546
#, perl-format
msgid "`%s'"
msgstr ""
-#: ../dgit:537
+#: ../dgit:567
msgid "bad byte count"
msgstr ""
-#: ../dgit:540
+#: ../dgit:570
msgid "data block"
msgstr ""
-#: ../dgit:621
-#, perl-format
-msgid "failed to fetch %s: %s"
-msgstr ""
-
-#: ../dgit:633
+#: ../dgit:649
#, perl-format
msgid "%s ok: %s"
msgstr ""
-#: ../dgit:635
+#: ../dgit:651
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr ""
-#: ../dgit:660
+#: ../dgit:676
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@ -132,141 +104,147 @@ msgid ""
" -c<name>=<value> set git config option (used directly by dgit too)\n"
msgstr ""
-#: ../dgit:679
+#: ../dgit:695
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
-#: ../dgit:683
+#: ../dgit:699
#, perl-format
msgid ""
"%s: %s\n"
"%s"
msgstr ""
-#: ../dgit:688
+#: ../dgit:704
msgid "too few arguments"
msgstr ""
-#: ../dgit:799
+#: ../dgit:820
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr ""
-#: ../dgit:802
+#: ../dgit:823
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
-#: ../dgit:822
+#: ../dgit:843
#, perl-format
msgid ""
"need value for one of: %s\n"
"%s: distro or suite appears not to be (properly) supported"
msgstr ""
-#: ../dgit:863
+#: ../dgit:884
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
-#: ../dgit:878
+#: ../dgit:899
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr ""
-#: ../dgit:894
+#: ../dgit:915
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr ""
-#: ../dgit:914
+#: ../dgit:935
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
-#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:953
+#, perl-format
+msgid "unknown %s `%s'"
+msgstr ""
+
+#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209
msgid "internal error"
msgstr ""
-#: ../dgit:925
+#: ../dgit:960
msgid "pushing but distro is configured readonly"
msgstr ""
-#: ../dgit:929
+#: ../dgit:964
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
msgstr ""
-#: ../dgit:1094
-msgid "this operation does not support multiple comma-separated suites"
-msgstr ""
-
-#: ../dgit:1140
+#: ../dgit:987
#, perl-format
msgid ""
-"config requested specific TLS key but do not know how to get curl to use "
-"exactly that EE key (%s)"
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
msgstr ""
-#: ../dgit:1161
-msgid "ftpmasterapi archive query method takes no data part"
+#: ../dgit:1150
+msgid "this operation does not support multiple comma-separated suites"
msgstr ""
-#: ../dgit:1169
-msgid "curl failed to print 3-digit HTTP code"
+#: ../dgit:1217
+#, perl-format
+msgid "fetch of %s failed (%s): %s"
msgstr ""
-#: ../dgit:1173
+#: ../dgit:1224
#, perl-format
msgid "fetch of %s gave HTTP code %s"
msgstr ""
-#: ../dgit:1189
+#: ../dgit:1245
+msgid "ftpmasterapi archive query method takes no data part"
+msgstr ""
+
+#: ../dgit:1263
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr ""
-#: ../dgit:1193
+#: ../dgit:1267
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr ""
-#: ../dgit:1195
+#: ../dgit:1269
#, perl-format
msgid "suite %s info has no codename\n"
msgstr ""
-#: ../dgit:1197
+#: ../dgit:1271
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr ""
-#: ../dgit:1199 ../dgit:1224
+#: ../dgit:1273 ../dgit:1298
msgid "bad ftpmaster api response: "
msgstr ""
-#: ../dgit:1213
+#: ../dgit:1287
#, perl-format
msgid "bad version: %s\n"
msgstr ""
-#: ../dgit:1215
+#: ../dgit:1289
msgid "bad component"
msgstr ""
-#: ../dgit:1218
+#: ../dgit:1292
msgid "bad filename"
msgstr ""
-#: ../dgit:1220
+#: ../dgit:1294
msgid "bad sha256sum"
msgstr ""
-#: ../dgit:1271
+#: ../dgit:1345
msgid "aptget archive query method takes no data part"
msgstr ""
-#: ../dgit:1355
+#: ../dgit:1429
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
@@ -274,163 +252,159 @@ msgid ""
" is on a filesystem mounted `noatime'; if so, please use `relatime'.)\n"
msgstr ""
-#: ../dgit:1377
+#: ../dgit:1453
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr ""
-#: ../dgit:1405
+#: ../dgit:1479
msgid "apt-get source did not produce a .dsc"
msgstr ""
-#: ../dgit:1406
+#: ../dgit:1480
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr ""
-#: ../dgit:1511
+#: ../dgit:1585
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
"in suite %s; --existing-package may help"
msgstr ""
-#: ../dgit:1702
+#: ../dgit:1724
#, perl-format
msgid "cannot operate on %s suite"
msgstr ""
-#: ../dgit:1705
+#: ../dgit:1727
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr ""
-#: ../dgit:1707
+#: ../dgit:1729
#, perl-format
msgid "canonical suite name is %s"
msgstr ""
-#: ../dgit:1727
+#: ../dgit:1749
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr ""
-#: ../dgit:1733
+#: ../dgit:1755
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr ""
-#: ../dgit:1760
+#: ../dgit:1782
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr ""
-#: ../dgit:1777
-msgid "unexpected results from git check query - "
-msgstr ""
-
-#: ../dgit:1792
+#: ../dgit:1805
#, perl-format
msgid "unknown git-check `%s'"
msgstr ""
-#: ../dgit:1807
+#: ../dgit:1820
#, perl-format
msgid "unknown git-create `%s'"
msgstr ""
-#: ../dgit:1844
+#: ../dgit:1857
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr ""
-#: ../dgit:1890
+#: ../dgit:1903
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr ""
-#: ../dgit:1901
+#: ../dgit:1914
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr ""
-#: ../dgit:1947
+#: ../dgit:1960
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr ""
-#: ../dgit:1956
+#: ../dgit:1969
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr ""
-#: ../dgit:1960
+#: ../dgit:1973
#, perl-format
msgid "%s has no files list field(s)"
msgstr ""
-#: ../dgit:1966
+#: ../dgit:1979
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr ""
-#: ../dgit:2006
+#: ../dgit:2019
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr ""
-#: ../dgit:2019
+#: ../dgit:2032
msgid "cannot find section/priority from .changes Files field"
msgstr ""
-#: ../dgit:2032
+#: ../dgit:2045
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
-#: ../dgit:2048
+#: ../dgit:2061
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ""
-#: ../dgit:2053
+#: ../dgit:2066
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr ""
-#: ../dgit:2061
+#: ../dgit:2074
#, perl-format
msgid "archive %s: %s"
msgstr ""
-#: ../dgit:2068
+#: ../dgit:2081
#, perl-format
msgid "archive contains %s with different checksum"
msgstr ""
-#: ../dgit:2096
+#: ../dgit:2109
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr ""
-#: ../dgit:2104
+#: ../dgit:2117
#, perl-format
msgid "[new .changes left in %s]"
msgstr ""
-#: ../dgit:2107
+#: ../dgit:2120
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr ""
-#: ../dgit:2131
+#: ../dgit:2139
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
"Maintainer field)"
msgstr ""
-#: ../dgit:2154
+#: ../dgit:2162
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
@@ -445,113 +419,108 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:2166
+#: ../dgit:2174
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
msgstr ""
-#: ../dgit:2197
+#: ../dgit:2205
msgid "Dpkg::Vendor `current vendor'"
msgstr ""
-#: ../dgit:2199
+#: ../dgit:2207
msgid "(base) distro being accessed"
msgstr ""
-#: ../dgit:2201
+#: ../dgit:2209
msgid "(nominal) distro being accessed"
msgstr ""
-#: ../dgit:2206
+#: ../dgit:2214
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr ""
-#: ../dgit:2231
+#: ../dgit:2239
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
msgstr ""
-#: ../dgit:2235
+#: ../dgit:2243
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr ""
-#: ../dgit:2237
+#: ../dgit:2245
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr ""
-#: ../dgit:2240
+#: ../dgit:2248
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr ""
-#: ../dgit:2249
+#: ../dgit:2257
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr ""
-#: ../dgit:2253
+#: ../dgit:2261
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr ""
-#: ../dgit:2256
+#: ../dgit:2264
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr ""
-#: ../dgit:2262
+#: ../dgit:2270
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
-#: ../dgit:2294 ../dgit:2299
-#, perl-format
-msgid "accessing %s: %s"
-msgstr ""
-
-#: ../dgit:2314 ../dgit:2321
-#, perl-format
-msgid "saving %s: %s"
-msgstr ""
-
-#: ../dgit:2386
+#: ../dgit:2341
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr ""
-#: ../dgit:2450 ../dgit:5974
-msgid "source package"
-msgstr ""
-
-#: ../dgit:2468
+#: ../dgit:2403
msgid "package changelog"
msgstr ""
-#: ../dgit:2508
+#: ../dgit:2443
msgid "package changelog has no entries!"
msgstr ""
-#: ../dgit:2527
+#: ../dgit:2512 ../dgit:2517
#, perl-format
-msgid "Import %s"
+msgid "accessing %s: %s"
msgstr ""
-#: ../dgit:2608
+#: ../dgit:2532 ../dgit:2539
+#, perl-format
+msgid "saving %s: %s"
+msgstr ""
+
+#: ../dgit:2565 ../dgit:6037
+msgid "source package"
+msgstr ""
+
+#: ../dgit:2643
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr ""
-#: ../dgit:2627
+#: ../dgit:2662
#, perl-format
msgid "%s failed: %s\n"
msgstr ""
-#: ../dgit:2636
+#: ../dgit:2671
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
@@ -560,21 +529,16 @@ msgid ""
" dpkg-source --before-build gave tree %s\n"
msgstr ""
-#: ../dgit:2651
+#: ../dgit:2686
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr ""
-#: ../dgit:2655
+#: ../dgit:2690
msgid "Import of source package"
msgstr ""
-#: ../dgit:2668
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr ""
-
-#: ../dgit:2672
+#: ../dgit:2710
#, perl-format
msgid ""
"\n"
@@ -583,51 +547,51 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:2714
+#: ../dgit:2752
#, perl-format
msgid "using existing %s"
msgstr ""
-#: ../dgit:2718
+#: ../dgit:2756
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
"file?)"
msgstr ""
-#: ../dgit:2722
+#: ../dgit:2760
#, perl-format
msgid "need to fetch correct version of %s"
msgstr ""
-#: ../dgit:2738
+#: ../dgit:2776
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
msgstr ""
-#: ../dgit:2833
+#: ../dgit:2871
msgid "too many iterations trying to get sane fetch!"
msgstr ""
-#: ../dgit:2848
+#: ../dgit:2886
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
-#: ../dgit:2892
+#: ../dgit:2930
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
-#: ../dgit:2907
+#: ../dgit:2945
msgid ""
"--dry-run specified but we actually wanted the results of git fetch,\n"
"so this is not going to work. Try running dgit fetch first,\n"
"or using --damp-run instead of --dry-run.\n"
msgstr ""
-#: ../dgit:2912
+#: ../dgit:2950
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
@@ -637,49 +601,24 @@ msgid ""
"warning: Will try again...\n"
msgstr ""
-#: ../dgit:2979
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr ""
-
-#: ../dgit:3028
-#, perl-format
-msgid "%s: NO git hash"
-msgstr ""
-
-#: ../dgit:3032
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr ""
-
-#: ../dgit:3039
-#, perl-format
-msgid "%s: specified git hash"
-msgstr ""
-
-#: ../dgit:3041
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr ""
-
-#: ../dgit:3063
+#: ../dgit:3097
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
-#: ../dgit:3068
+#: ../dgit:3102
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ""
-#: ../dgit:3073
+#: ../dgit:3107
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
"for which we have no configured url and .dsc provides no hint\n"
msgstr ""
-#: ../dgit:3083
+#: ../dgit:3117
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@ -688,54 +627,54 @@ msgid ""
"(can be overridden by config - consult documentation)\n"
msgstr ""
-#: ../dgit:3103
+#: ../dgit:3137
msgid "rewrite map"
msgstr ""
-#: ../dgit:3110
+#: ../dgit:3144
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
-#: ../dgit:3114
+#: ../dgit:3148
msgid "using rewritten git hash in place of .dsc value"
msgstr ""
-#: ../dgit:3116
+#: ../dgit:3150
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
-#: ../dgit:3123
+#: ../dgit:3157
msgid "additional commits"
msgstr ""
-#: ../dgit:3126
+#: ../dgit:3160
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
"but we could not obtain that object anywhere.\n"
msgstr ""
-#: ../dgit:3151
+#: ../dgit:3185
msgid "last upload to archive"
msgstr ""
-#: ../dgit:3155
+#: ../dgit:3189
msgid "no version available from the archive"
msgstr ""
-#: ../dgit:3238
+#: ../dgit:3272
msgid "dgit suite branch on dgit git server"
msgstr ""
-#: ../dgit:3245
+#: ../dgit:3279
msgid "dgit client's archive history view"
msgstr ""
-#: ../dgit:3250
+#: ../dgit:3284
msgid "Dgit field in .dsc from archive"
msgstr ""
-#: ../dgit:3278
+#: ../dgit:3312
#, perl-format
msgid ""
"\n"
@@ -745,15 +684,15 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:3291
+#: ../dgit:3325
msgid "archive .dsc names newer git commit"
msgstr ""
-#: ../dgit:3294
+#: ../dgit:3328
msgid "archive .dsc names other git commit, fixing up"
msgstr ""
-#: ../dgit:3315
+#: ../dgit:3349
#, perl-format
msgid ""
"\n"
@@ -761,7 +700,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../dgit:3324
+#: ../dgit:3358
#, perl-format
msgid ""
"\n"
@@ -771,7 +710,7 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3409
+#: ../dgit:3443
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
@@ -779,19 +718,19 @@ msgid ""
"Record that\n"
msgstr ""
-#: ../dgit:3422
+#: ../dgit:3456
msgid "should be treated as descended from\n"
msgstr ""
-#: ../dgit:3440
+#: ../dgit:3474
msgid "dgit repo server tip (last push)"
msgstr ""
-#: ../dgit:3442
+#: ../dgit:3476
msgid "local tracking tip (last fetch)"
msgstr ""
-#: ../dgit:3453
+#: ../dgit:3487
#, perl-format
msgid ""
"\n"
@@ -801,30 +740,30 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3468
+#: ../dgit:3502
msgid "fetched source tree"
msgstr ""
-#: ../dgit:3504
+#: ../dgit:3538
msgid "debian/changelog merge driver"
msgstr ""
-#: ../dgit:3569
+#: ../dgit:3603
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
msgstr ""
-#: ../dgit:3583
+#: ../dgit:3617
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr ""
-#: ../dgit:3598
+#: ../dgit:3632
#, perl-format
msgid "install %s: %s"
msgstr ""
-#: ../dgit:3625
+#: ../dgit:3659
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
@@ -832,30 +771,30 @@ msgid ""
"tree.\n"
msgstr ""
-#: ../dgit:3647
+#: ../dgit:3681
#, perl-format
msgid "fetching %s..."
msgstr ""
-#: ../dgit:3655
+#: ../dgit:3689
#, perl-format
msgid "failed to obtain %s: %s"
msgstr ""
-#: ../dgit:3694
+#: ../dgit:3728
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr ""
-#: ../dgit:3726
+#: ../dgit:3760
msgid "local combined tracking branch"
msgstr ""
-#: ../dgit:3728
+#: ../dgit:3762
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
-#: ../dgit:3767
+#: ../dgit:3801
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
@@ -863,7 +802,7 @@ msgid ""
"Input branches:\n"
msgstr ""
-#: ../dgit:3781
+#: ../dgit:3815
msgid ""
"\n"
"Key\n"
@@ -872,613 +811,257 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:3796
+#: ../dgit:3830
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr ""
-#: ../dgit:3814
+#: ../dgit:3848
#, perl-format
msgid "ready for work in %s"
msgstr ""
-#: ../dgit:3822
+#: ../dgit:3866
msgid "dry run makes no sense with clone"
msgstr ""
-#: ../dgit:3837
+#: ../dgit:3881
#, perl-format
msgid "create `%s': %s"
msgstr ""
-#: ../dgit:3853
+#: ../dgit:3893
msgid "fetching existing git history"
msgstr ""
-#: ../dgit:3857
+#: ../dgit:3896
msgid "starting new git history"
msgstr ""
-#: ../dgit:3883
+#: ../dgit:3921
#, perl-format
msgid ""
"FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
" Your vcs-git remote url may be out of date. Use dgit update-vcs-git ?\n"
msgstr ""
-#: ../dgit:3888
+#: ../dgit:3926
#, perl-format
msgid "fetched into %s"
msgstr ""
-#: ../dgit:3900
+#: ../dgit:3938
#, perl-format
msgid "Merge from %s [dgit]"
msgstr ""
-#: ../dgit:3902
+#: ../dgit:3940
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr ""
-#: ../dgit:3910
+#: ../dgit:3948
#, perl-format
msgid "git tree contains %s"
msgstr ""
-#: ../dgit:3921
+#: ../dgit:3959
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
-#: ../dgit:3940
+#: ../dgit:3978
#, perl-format
msgid ""
"quilt fixup required but quilt mode is `nofix'\n"
"HEAD commit%s differs from tree implied by debian/patches%s"
msgstr ""
-#: ../dgit:3957
+#: ../dgit:3995
msgid "nothing quilty to commit, ok."
msgstr ""
-#: ../dgit:3960
+#: ../dgit:3998
msgid " (wanted to commit patch update)"
msgstr ""
-#: ../dgit:3964
+#: ../dgit:4002
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
msgstr ""
-#: ../dgit:4007
+#: ../dgit:4046
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
msgstr ""
-#: ../dgit:4012
+#: ../dgit:4051
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr ""
-#: ../dgit:4022
+#: ../dgit:4061
#, perl-format
msgid "commit id %s"
msgstr ""
-#: ../dgit:4028
+#: ../dgit:4067
#, perl-format
msgid "and left in %s"
msgstr ""
-#: ../dgit:4054
+#: ../dgit:4093
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4057
+#: ../dgit:4096
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr ""
-#: ../dgit:4065
+#: ../dgit:4104
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
-#: ../dgit:4074
+#: ../dgit:4113
msgid "version currently in archive"
msgstr ""
-#: ../dgit:4083
+#: ../dgit:4122
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
-#: ../dgit:4091
+#: ../dgit:4130
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr ""
-#: ../dgit:4101
+#: ../dgit:4141
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr ""
-#: ../dgit:4104
+#: ../dgit:4144
#, perl-format
msgid ""
"%s is %s\n"
"Your tree seems to based on earlier (not uploaded) %s.\n"
msgstr ""
-#: ../dgit:4118
+#: ../dgit:4158
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr ""
-#: ../dgit:4174
+#: ../dgit:4214
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
-#: ../dgit:4183
+#: ../dgit:4223
msgid "maintainer view tag"
msgstr ""
-#: ../dgit:4185
+#: ../dgit:4225
msgid "dgit view tag"
msgstr ""
-#: ../dgit:4186
+#: ../dgit:4226
msgid "current archive contents"
msgstr ""
-#: ../dgit:4199
+#: ../dgit:4239
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
-#: ../dgit:4209
+#: ../dgit:4249
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr ""
-#: ../dgit:4210
+#: ../dgit:4250
#, perl-format
msgid "Make fast forward from %s\n"
msgstr ""
-#: ../dgit:4214
+#: ../dgit:4254
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr ""
-#: ../dgit:4227
+#: ../dgit:4267
#, perl-format
msgid "Declare fast forward from %s"
msgstr ""
-#: ../dgit:4235
+#: ../dgit:4275
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr ""
-#: ../dgit:4247
+#: ../dgit:4287
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr ""
-#: ../dgit:4269
+#: ../dgit:4309
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr ""
-#: ../dgit:4330
+#: ../dgit:4363
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr ""
-#: ../dgit:4358
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr ""
-
-#: ../dgit:4371
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4423
-msgid ""
-"Push failed, while checking state of the archive.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4432
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-
-#: ../dgit:4437
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4460
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr ""
-
-#: ../dgit:4477
-#, perl-format
-msgid ""
-"Branch is managed by git-debrebase (%s\n"
-"exists), but quilt mode (%s) implies a split view.\n"
-"Pass the right --quilt option or adjust your git config.\n"
-"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
-msgstr ""
-
-#: ../dgit:4501
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-
-#: ../dgit:4532
-msgid ""
-"dgit push: HEAD is not a descendant of the archive's version.\n"
-"To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
-"To rewind history, if permitted by the archive, use --deliberately-not-fast-"
-"forward."
-msgstr ""
-
-#: ../dgit:4542
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr ""
-
-#: ../dgit:4576 ../dgit:4588
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr ""
-
-#: ../dgit:4582
-#, perl-format
-msgid ""
-"There is a problem with your source tree (see dgit(7) for some hints).\n"
-"To see a full diff, run git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4592
-#, perl-format
-msgid ""
-"Perhaps you forgot to build. Or perhaps there is a problem with your\n"
-" source tree (see dgit(7) for some hints). To see a full diff, run\n"
-" git diff %s %s\n"
-msgstr ""
-
-#: ../dgit:4603
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-
-#: ../dgit:4625
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-
-#: ../dgit:4629
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-
-#: ../dgit:4633
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-
-#: ../dgit:4640
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr ""
-
-#: ../dgit:4684
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-
-#: ../dgit:4697
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4714
-msgid ""
-"Push failed, while updating the remote git repository - see messages above.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4731
-msgid ""
-"Push failed, while obtaining signatures on the .changes and .dsc.\n"
-"If it was just that the signature failed, you may try again by using\n"
-"debsign by hand to sign the changes file (see the command dgit tried,\n"
-"above), and then dput that changes file to complete the upload.\n"
-"If you need to change the package, you must use a new version number.\n"
-msgstr ""
-
-#: ../dgit:4762
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr ""
-
-#: ../dgit:4774
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-
-#: ../dgit:4785
-msgid "incorrect arguments to dgit clone"
-msgstr ""
-
-#: ../dgit:4791 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr ""
-
-#: ../dgit:4805
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4809
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr ""
-
-#: ../dgit:4847
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr ""
-
-#: ../dgit:4864
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-
-#: ../dgit:4873
-msgid "dgit checkout needs a suite argument"
-msgstr ""
-
-#: ../dgit:4935
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr ""
-
-#: ../dgit:4938
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr ""
-
-#: ../dgit:4940
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr ""
-
-#: ../dgit:4945
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr ""
-
-#: ../dgit:4960
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr ""
-
-#: ../dgit:4971
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-
-#: ../dgit:5009
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-
-#: ../dgit:5089
-#, perl-format
-msgid "create %s: %s"
-msgstr ""
-
-#: ../dgit:5126
-#, perl-format
-msgid "build host child failed: %s"
-msgstr ""
-
-#: ../dgit:5129
-msgid "all done\n"
-msgstr ""
-
-#: ../dgit:5138
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr ""
-
-#: ../dgit:5146
-msgid "bad param spec"
-msgstr ""
-
-#: ../dgit:5152
-msgid "bad previously spec"
-msgstr ""
-
-#: ../dgit:5171
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-
-#: ../dgit:5216
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr ""
-
-#: ../dgit:5219
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr ""
-
-#: ../dgit:5260
-msgid "remote changes file"
-msgstr ""
-
-#: ../dgit:5335
-msgid "not a plain file or symlink\n"
-msgstr ""
-
-#: ../dgit:5341
-msgid "mode or type changed\n"
-msgstr ""
-
-#: ../dgit:5342
-msgid "modified symlink\n"
-msgstr ""
-
-#: ../dgit:5345
-msgid "deletion of symlink\n"
-msgstr ""
-
-#: ../dgit:5349
-msgid "creation with non-default mode\n"
-msgstr ""
-
-#: ../dgit:5379
-msgid "dgit view: changes are required..."
-msgstr ""
-
-#: ../dgit:5408
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-
-#: ../dgit:5415
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-
-#: ../dgit:5421
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-
-#: ../dgit:5428
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-applied git tree\n"
-" but git tree differs from result of applying debian/patches to upstream\n"
-msgstr ""
-
-#: ../dgit:5435
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-
-#: ../dgit:5444
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying that HEAD is for use with a\n"
-" tool which does not create patches for changes to upstream\n"
-" .gitignores: but, such patches exist in debian/patches.\n"
-msgstr ""
-
-#: ../dgit:5453
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-
-#: ../dgit:5458
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-
-#: ../dgit:5463
-msgid ""
-"Subject: Update .gitignore from Debian packaging branch\n"
-"\n"
-"The Debian packaging git branch contains these updates to the upstream\n"
-".gitignore file(s). This patch is autogenerated, to provide these\n"
-"updates to users of the official Debian archive view of the package.\n"
-msgstr ""
-
-#: ../dgit:5485
-msgid "Commit patch to update .gitignore\n"
-msgstr ""
-
-#: ../dgit:5499
-msgid "converted"
-msgstr ""
-
-#: ../dgit:5500
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr ""
-
-#: ../dgit:5565
+#: ../dgit:5609
msgid "maximum search space exceeded"
msgstr ""
-#: ../dgit:5583
+#: ../dgit:5627
#, perl-format
msgid "has %s not %s"
msgstr ""
-#: ../dgit:5592
+#: ../dgit:5636
msgid "root commit"
msgstr ""
-#: ../dgit:5598
+#: ../dgit:5642
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr ""
-#: ../dgit:5610
+#: ../dgit:5654
#, perl-format
msgid "changed %s"
msgstr ""
-#: ../dgit:5629
+#: ../dgit:5673
#, perl-format
msgid ""
"\n"
"%s: error: quilt fixup cannot be linear. Stopped at:\n"
msgstr ""
-#: ../dgit:5636
+#: ../dgit:5680
#, perl-format
msgid "%s: %s: %s\n"
msgstr ""
-#: ../dgit:5648
+#: ../dgit:5692
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
-#: ../dgit:5651
+#: ../dgit:5695
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
-#: ../dgit:5663
+#: ../dgit:5707
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
@@ -1486,68 +1069,84 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:5670
+#: ../dgit:5714
msgid "quiltify linearisation planning successful, executing..."
msgstr ""
-#: ../dgit:5704
+#: ../dgit:5748
msgid "contains unexpected slashes\n"
msgstr ""
-#: ../dgit:5705
+#: ../dgit:5749
msgid "contains leading punctuation\n"
msgstr ""
-#: ../dgit:5706
+#: ../dgit:5750
msgid "contains bad character(s)\n"
msgstr ""
-#: ../dgit:5707
+#: ../dgit:5751
msgid "is series file\n"
msgstr ""
-#: ../dgit:5708
+#: ../dgit:5752
msgid "too long\n"
msgstr ""
-#: ../dgit:5712
+#: ../dgit:5756
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
-#: ../dgit:5741
+#: ../dgit:5785
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr ""
-#: ../dgit:5884
+#: ../dgit:5868
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
+#: ../dgit:5886
+msgid "converted"
+msgstr ""
+
+#: ../dgit:5887
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr ""
+
+#: ../dgit:5941
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
-#: ../dgit:5894
+#: ../dgit:5951
msgid "starting quiltify (single-debian-patch)"
msgstr ""
-#: ../dgit:5996
+#: ../dgit:6061
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
-#: ../dgit:6027
+#: ../dgit:6093
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr ""
-#: ../dgit:6032
+#: ../dgit:6098
msgid "dgit view: found cached, no changes required"
msgstr ""
-#: ../dgit:6043
+#: ../dgit:6133
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6134
+#: ../dgit:6247
msgid ""
"failed to apply your git tree's patch stack (from debian/patches/) to\n"
" the corresponding upstream tarball(s). Your source tree and .orig\n"
@@ -1555,58 +1154,84 @@ msgid ""
" anomaly (depending on the quilt mode). Please see --quilt= in dgit(1).\n"
msgstr ""
-#: ../dgit:6148
+#: ../dgit:6261
msgid "Tree already contains .pc - will use it then delete it."
msgstr ""
-#: ../dgit:6185
+#: ../dgit:6295
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6308
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6326
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6342
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6356
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6380
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr ""
-#: ../dgit:6188
+#: ../dgit:6390
#, perl-format
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
-"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
+"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
-#: ../dgit:6194
+#: ../dgit:6399
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr ""
-#: ../dgit:6198
+#: ../dgit:6403
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
-#: ../dgit:6205
+#: ../dgit:6410
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6414
msgid "This might be a patches-unapplied branch."
msgstr ""
-#: ../dgit:6208
+#: ../dgit:6417
msgid "This might be a patches-applied branch."
msgstr ""
-#: ../dgit:6211
+#: ../dgit:6420
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
-#: ../dgit:6214
+#: ../dgit:6423
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
-#: ../dgit:6218
+#: ../dgit:6427
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
-#: ../dgit:6227
+#: ../dgit:6438
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr ""
-#: ../dgit:6265
+#: ../dgit:6477
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@ -1615,102 +1240,124 @@ msgid ""
"\n"
msgstr ""
-#: ../dgit:6277
+#: ../dgit:6489
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
-#: ../dgit:6306
+#: ../dgit:6518
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
"or --clean=git (-wg/-wgf) to use `git clean' instead.\n"
msgstr ""
-#: ../dgit:6318
+#: ../dgit:6530
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
-#: ../dgit:6321
+#: ../dgit:6533
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
-#: ../dgit:6324
+#: ../dgit:6536
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
msgstr ""
-#: ../dgit:6342
+#: ../dgit:6549
+#, perl-format
+msgid ""
+"quilt mode %s (generally needs untracked upstream files)\n"
+"contradicts clean mode %s (which would delete them)\n"
+msgstr ""
+
+#: ../dgit:6566
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
-#: ../dgit:6356
+#: ../dgit:6580
msgid "clean takes no additional arguments"
msgstr ""
-#: ../dgit:6369
+#: ../dgit:6599
+#, perl-format
+msgid "-p specified package %s, but changelog says %s"
+msgstr ""
+
+#: ../dgit:6609
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+
+#: ../dgit:6618
#, perl-format
-msgid "-p is not allowed with dgit %s"
+msgid "dgit: --quilt=%s, %s"
msgstr ""
-#: ../dgit:6408
+#: ../dgit:6622
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
+msgstr ""
+
+#: ../dgit:6657
#, perl-format
msgid "remove old changes file %s: %s"
msgstr ""
-#: ../dgit:6410
+#: ../dgit:6659
#, perl-format
msgid "would remove %s"
msgstr ""
-#: ../dgit:6436
+#: ../dgit:6685
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
-#: ../dgit:6442
+#: ../dgit:6691
#, perl-format
msgid "changelog will contain changes since %s"
msgstr ""
-#: ../dgit:6445
+#: ../dgit:6694
msgid "package seems new, not specifying -v<version>"
msgstr ""
-#: ../dgit:6488
+#: ../dgit:6737
msgid "Wanted to build nothing!"
msgstr ""
-#: ../dgit:6526
+#: ../dgit:6775
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr ""
-#: ../dgit:6533
+#: ../dgit:6782
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr ""
-#: ../dgit:6540
+#: ../dgit:6789
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr ""
-#: ../dgit:6544
+#: ../dgit:6793
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr ""
-#: ../dgit:6549
+#: ../dgit:6798
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr ""
-#: ../dgit:6552
+#: ../dgit:6801
#, perl-format
msgid "build successful, results in %s\n"
msgstr ""
-#: ../dgit:6565
+#: ../dgit:6814
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
@@ -1718,136 +1365,136 @@ msgid ""
"Suggest you delete %s.\n"
msgstr ""
-#: ../dgit:6583
+#: ../dgit:6832
msgid "build successful\n"
msgstr ""
-#: ../dgit:6590
+#: ../dgit:6839
#, perl-format
msgid ""
"%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
"%s: warning: build-products-dir will be ignored; files will go to ..\n"
msgstr ""
-#: ../dgit:6700
+#: ../dgit:6949
#, perl-format
msgid "remove %s: %s"
msgstr ""
-#: ../dgit:6735
+#: ../dgit:6986
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr ""
-#: ../dgit:6755
+#: ../dgit:7006
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr ""
-#: ../dgit:6768
+#: ../dgit:7019
msgid "build-source takes no additional arguments"
msgstr ""
-#: ../dgit:6772
+#: ../dgit:7023
#, perl-format
msgid "source built, results in %s and %s"
msgstr ""
-#: ../dgit:6779
+#: ../dgit:7030
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
msgstr ""
-#: ../dgit:6785
+#: ../dgit:7036
msgid "source changes file"
msgstr ""
-#: ../dgit:6787
+#: ../dgit:7038
msgid "user-specified changes file is not source-only"
msgstr ""
-#: ../dgit:6807 ../dgit:6809
+#: ../dgit:7058 ../dgit:7060
#, perl-format
msgid "%s (in build products dir): %s"
msgstr ""
-#: ../dgit:6822
+#: ../dgit:7073
msgid ""
"perhaps you need to pass -A ? (sbuild's default is to build only\n"
"arch-specific binaries; dgit 1.4 used to override that.)\n"
msgstr ""
-#: ../dgit:6834
+#: ../dgit:7085
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
msgstr ""
-#: ../dgit:6838
+#: ../dgit:7089
msgid ""
"we must build a .dsc to pass to the builder but your debbuiltopts forbids "
"the building of a source package; cannot continue"
msgstr ""
-#: ../dgit:6868
+#: ../dgit:7119
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr ""
-#: ../dgit:6890
+#: ../dgit:7140
msgid "source tree"
msgstr ""
-#: ../dgit:6892
+#: ../dgit:7142
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr ""
-#: ../dgit:6905
+#: ../dgit:7155
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr ""
-#: ../dgit:6909
+#: ../dgit:7159
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr ""
-#: ../dgit:6913
+#: ../dgit:7163
msgid "dry run makes no sense with import-dsc"
msgstr ""
-#: ../dgit:6930
+#: ../dgit:7180
#, perl-format
msgid "%s is checked out - will not update it"
msgstr ""
-#: ../dgit:6935
+#: ../dgit:7185
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr ""
-#: ../dgit:6937
+#: ../dgit:7187
#, perl-format
msgid "read %s: %s"
msgstr ""
-#: ../dgit:6948
+#: ../dgit:7198
msgid "import-dsc signature check failed"
msgstr ""
-#: ../dgit:6951
+#: ../dgit:7201
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr ""
-#: ../dgit:6962
+#: ../dgit:7212
msgid "Dgit metadata in .dsc"
msgstr ""
-#: ../dgit:6973
+#: ../dgit:7223
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr ""
-#: ../dgit:6982
+#: ../dgit:7232
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
@@ -1855,21 +1502,21 @@ msgid ""
"plausible server (browse.dgit.d.o? salsa?), and try the import-dsc again.\n"
msgstr ""
-#: ../dgit:6989
+#: ../dgit:7239
msgid "Not fast forward, forced update."
msgstr ""
-#: ../dgit:6991
+#: ../dgit:7241
#, perl-format
msgid "Not fast forward to %s"
msgstr ""
-#: ../dgit:6996
+#: ../dgit:7246
#, perl-format
msgid "updated git ref %s"
msgstr ""
-#: ../dgit:7001
+#: ../dgit:7251
#, perl-format
msgid ""
"Branch %s already exists\n"
@@ -1877,134 +1524,129 @@ msgid ""
"Specify +%s to overwrite, discarding existing history\n"
msgstr ""
-#: ../dgit:7021
+#: ../dgit:7271
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr ""
-#: ../dgit:7023
+#: ../dgit:7273
#, perl-format
msgid "stat %s: %s"
msgstr ""
-#: ../dgit:7031
+#: ../dgit:7281
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr ""
-#: ../dgit:7050
+#: ../dgit:7300
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr ""
-#: ../dgit:7054
+#: ../dgit:7304
#, perl-format
msgid "symlink %s to %s: %s"
msgstr ""
-#: ../dgit:7055
+#: ../dgit:7305
#, perl-format
msgid "made symlink %s -> %s"
msgstr ""
-#: ../dgit:7066
+#: ../dgit:7316
msgid "Import, forced update - synthetic orphan git history."
msgstr ""
-#: ../dgit:7068
+#: ../dgit:7318
msgid "Import, merging."
msgstr ""
-#: ../dgit:7082
+#: ../dgit:7332
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr ""
-#: ../dgit:7091
+#: ../dgit:7341
#, perl-format
msgid "results are in git ref %s"
msgstr ""
-#: ../dgit:7098
+#: ../dgit:7348
msgid "need only 1 subpath argument"
msgstr ""
-#: ../dgit:7104
-#, perl-format
-msgid "exec curl: %s\n"
-msgstr ""
-
-#: ../dgit:7118
+#: ../dgit:7366
msgid "need destination argument"
msgstr ""
-#: ../dgit:7123
+#: ../dgit:7371
#, perl-format
msgid "exec git clone: %s\n"
msgstr ""
-#: ../dgit:7131
+#: ../dgit:7379
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr ""
-#: ../dgit:7142
+#: ../dgit:7390
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr ""
-#: ../dgit:7148
+#: ../dgit:7396
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr ""
-#: ../dgit:7155 ../dgit:7161
+#: ../dgit:7403 ../dgit:7409
msgid "no arguments allowed to dgit setup-useremail"
msgstr ""
-#: ../dgit:7167
+#: ../dgit:7415
msgid "no arguments allowed to dgit setup-tree"
msgstr ""
-#: ../dgit:7214
+#: ../dgit:7462
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
msgstr ""
-#: ../dgit:7253
+#: ../dgit:7501
#, perl-format
msgid "%s needs a value"
msgstr ""
-#: ../dgit:7257
+#: ../dgit:7505
#, perl-format
msgid "bad value `%s' for %s"
msgstr ""
-#: ../dgit:7348
+#: ../dgit:7605
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr ""
-#: ../dgit:7368
+#: ../dgit:7623
#, perl-format
msgid "unknown long option `%s'"
msgstr ""
-#: ../dgit:7423
+#: ../dgit:7678
#, perl-format
msgid "unknown short option `%s'"
msgstr ""
-#: ../dgit:7438
+#: ../dgit:7693
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr ""
-#: ../dgit:7442
+#: ../dgit:7697
#, perl-format
msgid "%s is blocked\n"
msgstr ""
-#: ../dgit:7448
+#: ../dgit:7703
#, perl-format
msgid ""
"On entry to dgit, %s\n"
@@ -2012,49 +1654,40 @@ msgid ""
"Giving up.\n"
msgstr ""
-#: ../dgit:7465
+#: ../dgit:7720
#, perl-format
msgid "cannot set command for %s"
msgstr ""
-#: ../dgit:7478
+#: ../dgit:7733
#, perl-format
msgid "cannot configure options for %s"
msgstr ""
-#: ../dgit:7498
+#: ../dgit:7753
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr ""
-#: ../dgit:7508
+#: ../dgit:7764
#, perl-format
msgid "unknown %s setting `%s'"
msgstr ""
-#: ../dgit:7513
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-
-#: ../dgit:7524
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr ""
-
-#: ../dgit:7545
+#: ../dgit:7792
msgid "DRY RUN ONLY\n"
msgstr ""
-#: ../dgit:7546
+#: ../dgit:7793
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
-#: ../dgit:7565
+#: ../dgit:7812
#, perl-format
msgid "unknown operation %s"
msgstr ""
-#: ../git-debrebase:44
+#: ../git-debrebase:45
msgid ""
"usages:\n"
" git-debrebase [<options>] [--|-i <git rebase options...>]\n"
@@ -2067,60 +1700,60 @@ msgid ""
"See git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
msgstr ""
-#: ../git-debrebase:67
+#: ../git-debrebase:68
#, perl-format
msgid "%s: bad usage: %s\n"
msgstr ""
-#: ../git-debrebase:78
+#: ../git-debrebase:79
#, perl-format
msgid "bad options follow `git-debrebase %s'"
msgstr ""
-#: ../git-debrebase:89
+#: ../git-debrebase:90
#, perl-format
msgid "missing required git config %s"
msgstr ""
-#: ../git-debrebase:401
+#: ../git-debrebase:363
#, perl-format
msgid "%s: snag ignored (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:404
+#: ../git-debrebase:366
#, perl-format
msgid "%s: snag detected (-f%s): %s\n"
msgstr ""
-#: ../git-debrebase:417
+#: ../git-debrebase:379
#, perl-format
msgid "%s: snags: %d overriden by individual -f options\n"
msgstr ""
-#: ../git-debrebase:423
+#: ../git-debrebase:385
#, perl-format
msgid "%s: snags: %d overriden by global --force\n"
msgstr ""
-#: ../git-debrebase:427
+#: ../git-debrebase:389
#, perl-format
msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
msgstr ""
-#: ../git-debrebase:459
+#: ../git-debrebase:421
msgid ""
"Branch/history seems mangled - no longer in gdr format.\n"
"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
msgstr ""
-#: ../git-debrebase:466
+#: ../git-debrebase:428
#, perl-format
msgid ""
"%s\n"
"Is this meant to be a gdr branch? %s\n"
msgstr ""
-#: ../git-debrebase:471
+#: ../git-debrebase:433
#, perl-format
msgid ""
"%s\n"
@@ -2128,7 +1761,7 @@ msgid ""
"Consider git-debrebase scrap, to throw away your recent work.\n"
msgstr ""
-#: ../git-debrebase:477
+#: ../git-debrebase:439
#, perl-format
msgid ""
"%s\n"
@@ -2136,7 +1769,7 @@ msgid ""
"Wrong branch, or maybe you needed git-debrebase convert-from-*.\n"
msgstr ""
-#: ../git-debrebase:488
+#: ../git-debrebase:450
#, perl-format
msgid ""
"%s\n"
@@ -2144,418 +1777,415 @@ msgid ""
"Maybe you reset to, or rebased from, somewhere inappropriate.\n"
msgstr ""
-#: ../git-debrebase:935
+#: ../git-debrebase:897
#, perl-format
msgid "git-debrebase `anchor' but %s"
msgstr ""
-#: ../git-debrebase:937
+#: ../git-debrebase:899
msgid "has other than two parents"
msgstr ""
-#: ../git-debrebase:938
+#: ../git-debrebase:900
msgid "contains debian/patches"
msgstr ""
-#: ../git-debrebase:964
+#: ../git-debrebase:926
msgid "is an origin commit"
msgstr ""
-#: ../git-debrebase:966
+#: ../git-debrebase:928
msgid "upstream files differ from left parent"
msgstr ""
-#: ../git-debrebase:968
+#: ../git-debrebase:930
msgid "debian/ differs from right parent"
msgstr ""
-#: ../git-debrebase:979
+#: ../git-debrebase:941
msgid "edits debian/patches"
msgstr ""
-#: ../git-debrebase:991
+#: ../git-debrebase:953
msgid "parent's debian is not a directory"
msgstr ""
-#: ../git-debrebase:998
+#: ../git-debrebase:960
msgid "no changes"
msgstr ""
-#: ../git-debrebase:1004
+#: ../git-debrebase:966
msgid "origin commit"
msgstr ""
-#: ../git-debrebase:1055
+#: ../git-debrebase:1017
#, perl-format
msgid "unknown kind of merge from %s"
msgstr ""
-#: ../git-debrebase:1058
+#: ../git-debrebase:1020
msgid "octopus merge"
msgstr ""
-#: ../git-debrebase:1062
+#: ../git-debrebase:1024
msgid "general two-parent merge"
msgstr ""
-#: ../git-debrebase:1079
+#: ../git-debrebase:1041
#, perl-format
msgid "inconsistent anchors in merged-breakwaters %s"
msgstr ""
-#: ../git-debrebase:1119
+#: ../git-debrebase:1081
#, perl-format
msgid "branch needs laundering (run git-debrebase): %s"
msgstr ""
-#: ../git-debrebase:1147
+#: ../git-debrebase:1109
#, perl-format
msgid "packaging change (%s) follows upstream change"
msgstr ""
-#: ../git-debrebase:1148
+#: ../git-debrebase:1110
#, perl-format
msgid " (eg %s)"
msgstr ""
-#: ../git-debrebase:1154
+#: ../git-debrebase:1116
msgid "found mixed upstream/packaging commit"
msgstr ""
-#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
-#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130
+#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149
#, perl-format
msgid " (%s)"
msgstr ""
-#: ../git-debrebase:1162
+#: ../git-debrebase:1124
#, perl-format
msgid "found interchange bureaucracy commit (%s)"
msgstr ""
-#: ../git-debrebase:1167
+#: ../git-debrebase:1129
msgid "found dgit dsc import"
msgstr ""
-#: ../git-debrebase:1172
+#: ../git-debrebase:1134
msgid "found bare dgit dsc import with no prior history"
msgstr ""
-#: ../git-debrebase:1178
+#: ../git-debrebase:1140
msgid "found vanilla merge"
msgstr ""
-#: ../git-debrebase:1185
+#: ../git-debrebase:1147
#, perl-format
msgid "found unprocessable commit, cannot cope: %s"
msgstr ""
-#: ../git-debrebase:1253
+#: ../git-debrebase:1215
#, perl-format
msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1254
+#: ../git-debrebase:1216
#, perl-format
msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
msgstr ""
-#: ../git-debrebase:1375
+#: ../git-debrebase:1337
msgid "bare dgit dsc import"
msgstr ""
-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1677 ../git-debrebase:1680
#, perl-format
msgid "mismatch %s ?"
msgstr ""
-#: ../git-debrebase:1721
+#: ../git-debrebase:1683
#, perl-format
msgid "mismatch %s != %s ?"
msgstr ""
-#: ../git-debrebase:1731
+#: ../git-debrebase:1693
#, perl-format
msgid "internal error %#x %s %s"
msgstr ""
-#: ../git-debrebase:1759
+#: ../git-debrebase:1721
#, perl-format
msgid "%s: laundered (head was %s)\n"
msgstr ""
-#: ../git-debrebase:1773
+#: ../git-debrebase:1735
msgid "you are in the middle of a git-rebase already"
msgstr ""
-#: ../git-debrebase:1799
+#: ../git-debrebase:1761
msgid "launder for rebase"
msgstr ""
-#: ../git-debrebase:1804
+#: ../git-debrebase:1766
msgid "analyse does not support any options"
msgstr ""
-#: ../git-debrebase:1806
+#: ../git-debrebase:1768
msgid "too many arguments to analyse"
msgstr ""
-#: ../git-debrebase:1841
+#: ../git-debrebase:1801
+#, perl-format
+msgid "%s already exists"
+msgstr ""
+
+#: ../git-debrebase:1803
msgid "HEAD symref is not to refs/heads/"
msgstr ""
-#: ../git-debrebase:1864
+#: ../git-debrebase:1826
#, perl-format
msgid "OK, you are ahead of %s\n"
msgstr ""
-#: ../git-debrebase:1868
+#: ../git-debrebase:1830
#, perl-format
msgid "you are behind %s, divergence risk"
msgstr ""
-#: ../git-debrebase:1872
+#: ../git-debrebase:1834
#, perl-format
msgid "you have diverged from %s"
msgstr ""
-#: ../git-debrebase:1894
+#: ../git-debrebase:1856
msgid "remote dgit branch"
msgstr ""
-#: ../git-debrebase:1897
+#: ../git-debrebase:1859
msgid "remote dgit branch for sid"
msgstr ""
-#: ../git-debrebase:1925
+#: ../git-debrebase:1887
msgid "Recorded previous head for preservation"
msgstr ""
-#: ../git-debrebase:1933
+#: ../git-debrebase:1895
#, perl-format
msgid "could not record ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1944
+#: ../git-debrebase:1906
#, perl-format
msgid "could not check ffq-prev: %s"
msgstr ""
-#: ../git-debrebase:1964
+#: ../git-debrebase:1926
msgid "fast forward"
msgstr ""
-#: ../git-debrebase:1974
+#: ../git-debrebase:1936
msgid "Declare fast forward / record previous work"
msgstr ""
-#: ../git-debrebase:1986
+#: ../git-debrebase:1948
msgid "No ffq-prev to stitch."
msgstr ""
-#: ../git-debrebase:2017
-#, perl-format
-msgid ""
-"Could not determine appropriate upstream commitish.\n"
-" (Tried these tags: %s)\n"
-" Check version, and specify upstream commitish explicitly."
-msgstr ""
-
-#: ../git-debrebase:2036
+#: ../git-debrebase:1965
msgid "need NEW-VERSION [UPS-COMMITTISH]"
msgstr ""
-#: ../git-debrebase:2041
+#: ../git-debrebase:1970
#, perl-format
msgid "bad version number `%s'"
msgstr ""
-#: ../git-debrebase:2059
+#: ../git-debrebase:1988
#, perl-format
msgid "upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2060
+#: ../git-debrebase:1989
msgid "upstream (main piece"
msgstr ""
-#: ../git-debrebase:2080
+#: ../git-debrebase:2009
msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
msgstr ""
-#: ../git-debrebase:2098
+#: ../git-debrebase:2027
msgid "old anchor is recognised due to --anchor, cannot check upstream"
msgstr ""
-#: ../git-debrebase:2114
+#: ../git-debrebase:2043
#, perl-format
msgid ""
"previous upstream combine %s mentions %d pieces (each implying one parent) "
"but has %d parents (one per piece plus maybe a previous combine)"
msgstr ""
-#: ../git-debrebase:2123
+#: ../git-debrebase:2052
#, perl-format
msgid "previous upstream combine %s first piece is not `.'"
msgstr ""
-#: ../git-debrebase:2136
+#: ../git-debrebase:2065
#, perl-format
msgid ""
"previous upstream %s is from git-debrebase but not an `upstream-combine' "
"commit"
msgstr ""
-#: ../git-debrebase:2147
+#: ../git-debrebase:2076
#, perl-format
msgid "introducing upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2150
+#: ../git-debrebase:2079
#, perl-format
msgid "dropping upstream piece `%s'"
msgstr ""
-#: ../git-debrebase:2153
+#: ../git-debrebase:2082
#, perl-format
msgid "not fast forward: %s %s"
msgstr ""
-#: ../git-debrebase:2264
+#: ../git-debrebase:2193
msgid "Previous head already recorded\n"
msgstr ""
-#: ../git-debrebase:2268
+#: ../git-debrebase:2197
#, perl-format
msgid "Could not preserve: %s"
msgstr ""
-#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285
-#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408
-#: ../git-debrebase:2472
+#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214
+#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337
+#: ../git-debrebase:2401
msgid "no arguments allowed"
msgstr ""
-#: ../git-debrebase:2307
+#: ../git-debrebase:2236
msgid "branch contains furniture (not laundered)"
msgstr ""
-#: ../git-debrebase:2308
+#: ../git-debrebase:2237
msgid "branch is unlaundered"
msgstr ""
-#: ../git-debrebase:2309
+#: ../git-debrebase:2238
msgid "branch needs laundering"
msgstr ""
-#: ../git-debrebase:2310
+#: ../git-debrebase:2239
msgid "branch not in git-debrebase form"
msgstr ""
-#: ../git-debrebase:2320
+#: ../git-debrebase:2249
msgid "current branch contents, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2322
+#: ../git-debrebase:2251
msgid " branch is laundered\n"
msgstr ""
-#: ../git-debrebase:2338
+#: ../git-debrebase:2267
#, perl-format
msgid " %s is not well-defined\n"
msgstr ""
-#: ../git-debrebase:2344
+#: ../git-debrebase:2273
msgid "key git-debrebase commits:\n"
msgstr ""
-#: ../git-debrebase:2345
+#: ../git-debrebase:2274
msgid "anchor"
msgstr ""
-#: ../git-debrebase:2346
+#: ../git-debrebase:2275
msgid "breakwater"
msgstr ""
-#: ../git-debrebase:2351
+#: ../git-debrebase:2280
msgid "branch and ref status, in git-debrebase terms:\n"
msgstr ""
-#: ../git-debrebase:2358
+#: ../git-debrebase:2287
msgid " unstitched; previous tip was:\n"
msgstr ""
-#: ../git-debrebase:2361
+#: ../git-debrebase:2290
msgid " stitched? (no record of git-debrebase work)\n"
msgstr ""
-#: ../git-debrebase:2363
+#: ../git-debrebase:2292
msgid " stitched\n"
msgstr ""
-#: ../git-debrebase:2365
+#: ../git-debrebase:2294
msgid " not git-debrebase (diverged since last stitch)\n"
msgstr ""
-#: ../git-debrebase:2368
+#: ../git-debrebase:2297
msgid "you are currently rebasing\n"
msgstr ""
-#: ../git-debrebase:2385 ../git-debrebase:2398
+#: ../git-debrebase:2314 ../git-debrebase:2327
msgid "launder for git-debrebase quick"
msgstr ""
-#: ../git-debrebase:2392 ../git-debrebase:2422
+#: ../git-debrebase:2321 ../git-debrebase:2351
msgid "No ongoing git-debrebase session."
msgstr ""
-#: ../git-debrebase:2461
+#: ../git-debrebase:2390
msgid "Commit patch queue (exported by git-debrebase)"
msgstr ""
-#: ../git-debrebase:2478
+#: ../git-debrebase:2407
msgid "No (more) patches to export."
msgstr ""
-#: ../git-debrebase:2485
+#: ../git-debrebase:2414
#, perl-format
msgid ""
"Patch export produced patch amendments (abandoned output commit %s). Try "
"laundering first."
msgstr ""
-#: ../git-debrebase:2505
+#: ../git-debrebase:2434
#, perl-format
msgid "%s contains comments, which will be discarded"
msgstr ""
-#: ../git-debrebase:2510
+#: ../git-debrebase:2439
#, perl-format
msgid "patch %s repeated in %s !"
msgstr ""
-#: ../git-debrebase:2517
+#: ../git-debrebase:2446
#, perl-format
msgid "Unused patch file %s will be discarded"
msgstr ""
-#: ../git-debrebase:2525
+#: ../git-debrebase:2454
msgid "ffq-prev exists, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2530
+#: ../git-debrebase:2459
msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
msgstr ""
-#: ../git-debrebase:2546
+#: ../git-debrebase:2475
msgid "want only 1 optional argument, the upstream git commitish"
msgstr ""
-#: ../git-debrebase:2551
+#: ../git-debrebase:2480
msgid "missing Version from changelog\n"
msgstr ""
-#: ../git-debrebase:2567
+#: ../git-debrebase:2496
#, perl-format
msgid ""
"upstream (%s) and HEAD are not\n"
@@ -2563,58 +2193,58 @@ msgid ""
" git diff %s HEAD -- :!/debian :/\n"
msgstr ""
-#: ../git-debrebase:2575
+#: ../git-debrebase:2504
#, perl-format
msgid "upstream (%s) is not an ancestor of HEAD"
msgstr ""
-#: ../git-debrebase:2582
+#: ../git-debrebase:2511
#, perl-format
msgid ""
"history between upstream (%s) and HEAD contains direct changes to upstream "
"files - are you sure this is a gbp (patches-unapplied) branch?"
msgstr ""
-#: ../git-debrebase:2584
+#: ../git-debrebase:2513
#, perl-format
msgid "list expected changes with: %s\n"
msgstr ""
-#: ../git-debrebase:2591
+#: ../git-debrebase:2520
#, perl-format
msgid "upstream (%s) contains debian/ directory"
msgstr ""
-#: ../git-debrebase:2609
+#: ../git-debrebase:2538
msgid "neither of the first two changelog entries are released\n"
msgstr ""
-#: ../git-debrebase:2615
+#: ../git-debrebase:2544
#, perl-format
msgid "could not find suitable maintainer view tag %s\n"
msgstr ""
-#: ../git-debrebase:2618
+#: ../git-debrebase:2547
#, perl-format
msgid "HEAD is not FF from maintainer tag %s!"
msgstr ""
-#: ../git-debrebase:2621
+#: ../git-debrebase:2550
#, perl-format
msgid "dgit view tag %s not found\n"
msgstr ""
-#: ../git-debrebase:2623
+#: ../git-debrebase:2552
#, perl-format
msgid "dgit view tag %s is not FF from maintainer tag %s\n"
msgstr ""
-#: ../git-debrebase:2625
+#: ../git-debrebase:2554
#, perl-format
msgid "will stitch in dgit view, %s\n"
msgstr ""
-#: ../git-debrebase:2632
+#: ../git-debrebase:2561
#, perl-format
msgid ""
"Cannot confirm dgit view: %s\n"
@@ -2622,12 +2252,12 @@ msgid ""
"dgit --overwrite will be needed on the first dgit push after conversion.\n"
msgstr ""
-#: ../git-debrebase:2678
+#: ../git-debrebase:2607
#, perl-format
msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
msgstr ""
-#: ../git-debrebase:2707
+#: ../git-debrebase:2636
#, perl-format
msgid ""
"%s: converted to git-buildpackage branch format\n"
@@ -2635,16 +2265,16 @@ msgid ""
"%s: WARNING: doing so would drop all upstream patches!\n"
msgstr ""
-#: ../git-debrebase:2728
+#: ../git-debrebase:2657
msgid "takes 1 optional argument, the upstream commitish"
msgstr ""
-#: ../git-debrebase:2736
+#: ../git-debrebase:2665
#, perl-format
msgid "%s, from command line"
msgstr ""
-#: ../git-debrebase:2750
+#: ../git-debrebase:2679
#, perl-format
msgid ""
"%s: Branch already seems to be in git-debrebase format!\n"
@@ -2652,225 +2282,242 @@ msgid ""
"%s: but is probably a bad idea. Probably, you wanted to do nothing.\n"
msgstr ""
-#: ../git-debrebase:2754
+#: ../git-debrebase:2683
msgid "Branch already in git-debrebase format."
msgstr ""
-#: ../git-debrebase:2766
+#: ../git-debrebase:2695
msgid "Considering possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2773
+#: ../git-debrebase:2702
#, perl-format
msgid "git tag %s"
msgstr ""
-#: ../git-debrebase:2779
+#: ../git-debrebase:2708
#, perl-format
msgid " git tag: no suitable tag found (tried %s)\n"
msgstr ""
-#: ../git-debrebase:2788
+#: ../git-debrebase:2717
#, perl-format
msgid "opendir build-products-dir %s: %s"
msgstr ""
-#: ../git-debrebase:2794
+#: ../git-debrebase:2723
#, perl-format
msgid " orig: found what looks like a .orig, %s\n"
msgstr ""
-#: ../git-debrebase:2825
+#: ../git-debrebase:2754
#, perl-format
msgid " orig: no suitable origs found (looked for %s in %s)\n"
msgstr ""
-#: ../git-debrebase:2834
+#: ../git-debrebase:2763
msgid "Evaluating possible commits corresponding to upstream:\n"
msgstr ""
-#: ../git-debrebase:2871
+#: ../git-debrebase:2800
#, perl-format
msgid " %s: couldn't apply patches: gbp pq %s"
msgstr ""
-#: ../git-debrebase:2880
+#: ../git-debrebase:2809
#, perl-format
msgid " %s: applying patches gives different tree\n"
msgstr ""
-#: ../git-debrebase:2894
+#: ../git-debrebase:2823
msgid ""
"Could not find or construct a suitable upstream commit.\n"
"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
"upstream commmit explicitly or provide suitable origs.\n"
msgstr ""
-#: ../git-debrebase:2900
+#: ../git-debrebase:2829
#, perl-format
msgid "Yes, will base new branch on %s\n"
msgstr ""
-#: ../git-debrebase:2907
+#: ../git-debrebase:2836
msgid "forget-was-ever-debrebase takes no further arguments"
msgstr ""
-#: ../git-debrebase:2911
+#: ../git-debrebase:2840
#, perl-format
msgid "Not suitable for recording git-debrebaseness anyway: %s"
msgstr ""
-#: ../git-debrebase:3013
+#: ../git-debrebase:2942
msgid "bad options\n"
msgstr ""
-#: ../git-debrebase:3023
+#: ../git-debrebase:2952
#, perl-format
msgid "%s: no cuddling to -i for git-rebase"
msgstr ""
-#: ../git-debrebase:3053
+#: ../git-debrebase:2982
#, perl-format
msgid "unknown git-debrebase sub-operation %s"
msgstr ""
-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:296
#, perl-format
msgid "error: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:322
#, perl-format
msgid "getcwd failed: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:341
msgid "terminated, reporting successful completion"
msgstr ""
-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:343
#, perl-format
msgid "failed with error exit status %s"
msgstr ""
-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:346
#, perl-format
msgid "died due to fatal signal %s"
msgstr ""
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:350
#, perl-format
msgid "failed with unknown wait status %s"
msgstr ""
-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:356
msgid "failed command"
msgstr ""
-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:362
#, perl-format
msgid "failed to fork/exec: %s"
msgstr ""
-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:364
#, perl-format
msgid "subprocess %s"
msgstr ""
-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:366
msgid "subprocess produced invalid output"
msgstr ""
-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:457
msgid "stat source file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:467
msgid "stat destination file: %S"
msgstr ""
-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:486
msgid "finally install file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:492
msgid "delete old file after cp: %S"
msgstr ""
-#: ../Debian/Dgit.pm:506
+#: ../Debian/Dgit.pm:513
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
msgstr ""
-#: ../Debian/Dgit.pm:509
+#: ../Debian/Dgit.pm:516
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:624
msgid "git index contains changes (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:625
msgid "working tree is dirty (does not match HEAD)"
msgstr ""
-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:647
+msgid "using specified upstream commitish"
+msgstr ""
+
+#: ../Debian/Dgit.pm:653
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+
+#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:767
msgid "detached HEAD"
msgstr ""
-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:768
msgid "HEAD symref is not to refs/"
msgstr ""
-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:784
#, perl-format
msgid "parsing of %s failed"
msgstr ""
-#: ../Debian/Dgit.pm:715
+#: ../Debian/Dgit.pm:793
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
"modify the .dsc and then do the signature itself"
msgstr ""
-#: ../Debian/Dgit.pm:729
+#: ../Debian/Dgit.pm:807
#, perl-format
msgid "open %s (%s): %s"
msgstr ""
-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:828
#, perl-format
msgid "missing field %s in %s"
msgstr ""
-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:914
msgid "Dummy commit - do not use\n"
msgstr ""
-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:935
#, perl-format
msgid "exec %s: %s\n"
msgstr ""
-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1003
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr ""
-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1026
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1034
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr ""
-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1043
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 4aad97d..837aaa7 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: dgit_8.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-03-01 21:54+0000\n"
+"POT-Creation-Date: 2019-08-10 18:42+0000\n"
"PO-Revision-Date: 2019-01-19 20:58+0100\n"
"Last-Translator: Frans Spiesschaert <Frans.Spiesschaert@yucom.be>\n"
"Language-Team: Debian Dutch l10n Team <debian-l10n-dutch@lists.debian.org>\n"
@@ -19,79 +19,74 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: ../dgit:242
+#: ../dgit:265
#, perl-format
msgid "%s: invalid configuration: %s\n"
msgstr "%s: ongeldige configuratie: %s\n"
-#: ../dgit:249
+#: ../dgit:272
msgid "warning: overriding problem due to --force:\n"
msgstr "waarschuwing: overschrijvingsprobleem wegens --force:\n"
-#: ../dgit:257
+#: ../dgit:280
#, perl-format
msgid "warning: skipping checks or functionality due to --force-%s\n"
msgstr ""
"waarschuwing: controles of functionaliteit overgeslagen wegens --force-%s\n"
-#: ../dgit:262
+#: ../dgit:285
#, perl-format
msgid "%s: source package %s does not exist in suite %s\n"
msgstr "%s: broncodepakket %s bestaat niet in suite %s\n"
-#: ../dgit:487
+#: ../dgit:517
#, perl-format
msgid "build host child %s"
msgstr "bouwcomputer-dochter %s"
-#: ../dgit:492 ../dgit:498
+#: ../dgit:522 ../dgit:528
#, perl-format
msgid "connection lost: %s"
msgstr "verbinding verbroken: %s"
-#: ../dgit:493
+#: ../dgit:523
#, perl-format
msgid "protocol violation; %s not expected"
msgstr "protocolschending; %s werd niet verwacht"
-#: ../dgit:501
+#: ../dgit:531
#, perl-format
msgid "eof (reading %s)"
msgstr "eof (bij het lezen van %s)"
-#: ../dgit:508
+#: ../dgit:538
msgid "protocol message"
msgstr "protocolbericht"
-#: ../dgit:516
+#: ../dgit:546
#, perl-format
msgid "`%s'"
msgstr "`%s'"
-#: ../dgit:537
+#: ../dgit:567
msgid "bad byte count"
msgstr "aantal slechte bytes"
-#: ../dgit:540
+#: ../dgit:570
msgid "data block"
msgstr "gegevensblok"
-#: ../dgit:621
-#, perl-format
-msgid "failed to fetch %s: %s"
-msgstr "ophalen (fetch) van %s mislukt: %s"
-
-#: ../dgit:633
+#: ../dgit:649
#, perl-format
msgid "%s ok: %s"
msgstr "%s oké: %s"
-#: ../dgit:635
+#: ../dgit:651
#, perl-format
msgid "would be ok: %s (but dry run only)"
msgstr "zou oké zijn: %s (maar slechts een testuitvoering)"
-#: ../dgit:660
+#: ../dgit:676
msgid ""
"main usages:\n"
" dgit [dgit-opts] clone [dgit-opts] package [suite] [./dir|/dir]\n"
@@ -131,13 +126,13 @@ msgstr ""
" -c<naam>=<waarde> configuratieoptie instellen voor git\n"
" (ook rechtstreeks gebruikt door dgit)\n"
-#: ../dgit:679
+#: ../dgit:695
msgid "Perhaps the upload is stuck in incoming. Using the version from git.\n"
msgstr ""
"Misschien zit de upload vast in incoming. De versie van git wordt "
"gebruikt.\n"
-#: ../dgit:683
+#: ../dgit:699
#, perl-format
msgid ""
"%s: %s\n"
@@ -146,22 +141,22 @@ msgstr ""
"%s: %s\n"
"%s"
-#: ../dgit:688
+#: ../dgit:704
msgid "too few arguments"
msgstr "te weinig argumenten"
-#: ../dgit:799
+#: ../dgit:820
#, perl-format
msgid "multiple values for %s (in %s git config)"
msgstr "verschillende waarden voor %s (in %s git config)"
-#: ../dgit:802
+#: ../dgit:823
#, perl-format
msgid "value for config option %s (in %s git config) contains newline(s)!"
msgstr ""
"waarde voor configuratieoptie %s (in %s git config) bevat regeleinde(s)!"
-#: ../dgit:822
+#: ../dgit:843
#, perl-format
msgid ""
"need value for one of: %s\n"
@@ -170,39 +165,45 @@ msgstr ""
"heb waarde nodig voor één van: %s\n"
"%s: distributie of suite lijkt niet (behoorlijk) ondersteund te worden"
-#: ../dgit:863
+#: ../dgit:884
#, perl-format
msgid "bad syntax for (nominal) distro `%s' (does not match %s)"
msgstr ""
"slechte syntaxis voor (nominale) distributie `%s' (komt niet overeen met %s)"
-#: ../dgit:878
+#: ../dgit:899
#, perl-format
msgid "backports-quirk needs % or ( )"
msgstr "backports-spitsvondigheid vereist % of ( )"
-#: ../dgit:894
+#: ../dgit:915
#, perl-format
msgid "%s needs t (true, y, 1) or f (false, n, 0) not `%s'"
msgstr "%s vereist t (true, y, 1) of f (false, n, 0) en niet `%s'"
-#: ../dgit:914
+#: ../dgit:935
msgid "readonly needs t (true, y, 1) or f (false, n, 0) or a (auto)"
msgstr ""
"alleen-lezen (readonly) vereist t (true, y, 1) of f (false, n, 0) of een "
"(auto)"
-#: ../dgit:923 ../git-debrebase:1586 ../Debian/Dgit.pm:201
+#: ../dgit:953
+#, fuzzy, perl-format
+#| msgid "unknown %s setting `%s'"
+msgid "unknown %s `%s'"
+msgstr "onbekende %s dat `%s' instelt"
+
+#: ../dgit:958 ../git-debrebase:1548 ../Debian/Dgit.pm:209
msgid "internal error"
msgstr "interne fout"
-#: ../dgit:925
+#: ../dgit:960
msgid "pushing but distro is configured readonly"
msgstr ""
"bezig een push uit te voeren, maar de distributie is voor alleen-lezen "
"geconfigureerd"
-#: ../dgit:929
+#: ../dgit:964
msgid ""
"Push failed, before we got started.\n"
"You can retry the push, after fixing the problem, if you like.\n"
@@ -211,83 +212,83 @@ msgstr ""
"Als u wilt, kunt u de push opnieuw proberen nadat het probleem opgelost "
"werd.\n"
-#: ../dgit:1094
+#: ../dgit:987
+#, perl-format
+msgid ""
+"dgit: quilt mode `%s' (for format `%s') implies split view, but split-view "
+"set to `%s'"
+msgstr ""
+
+#: ../dgit:1150
msgid "this operation does not support multiple comma-separated suites"
msgstr ""
"meerdere met een komma van elkaar gescheiden suites worden door deze "
"bewerking niet ondersteund"
-#: ../dgit:1140
+#: ../dgit:1217
+#, fuzzy, perl-format
+#| msgid "fetch of %s gave HTTP code %s"
+msgid "fetch of %s failed (%s): %s"
+msgstr "een fetch van %s gaf HTTP-code %s"
+
+#: ../dgit:1224
#, perl-format
-msgid ""
-"config requested specific TLS key but do not know how to get curl to use "
-"exactly that EE key (%s)"
-msgstr ""
-"de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe curl "
-"ertoe te brengen exact die EE-sleutel (%s) te gebruiken"
+msgid "fetch of %s gave HTTP code %s"
+msgstr "een fetch van %s gaf HTTP-code %s"
-#: ../dgit:1161
+#: ../dgit:1245
msgid "ftpmasterapi archive query method takes no data part"
msgstr ""
"de methode ftpmasterapi voor een verzoek aan het archief kent geen data-"
"onderdeel"
-#: ../dgit:1169
-msgid "curl failed to print 3-digit HTTP code"
-msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code"
-
-#: ../dgit:1173
-#, perl-format
-msgid "fetch of %s gave HTTP code %s"
-msgstr "een fetch van %s gaf HTTP-code %s"
-
-#: ../dgit:1189
+#: ../dgit:1263
#, perl-format
msgid "unknown suite %s, maybe -d would help"
msgstr "onbekende suite %s, misschien is -d nuttig"
-#: ../dgit:1193
+#: ../dgit:1267
#, perl-format
msgid "multiple matches for suite %s\n"
msgstr "meerdere overeenkomsten met suite %s\n"
-#: ../dgit:1195
+#: ../dgit:1269
#, perl-format
msgid "suite %s info has no codename\n"
msgstr "info over suite %s bevat geen codenaam\n"
-#: ../dgit:1197
+#: ../dgit:1271
#, perl-format
msgid "suite %s maps to bad codename\n"
msgstr "suite %s is gekoppeld aan een verkeerde codenaam\n"
-#: ../dgit:1199 ../dgit:1224
+#: ../dgit:1273 ../dgit:1298
msgid "bad ftpmaster api response: "
msgstr "verkeerd antwoord van de ftpmaster api:"
-#: ../dgit:1213
+#: ../dgit:1287
#, perl-format
msgid "bad version: %s\n"
msgstr "verkeerde versie: %s\n"
-#: ../dgit:1215
+#: ../dgit:1289
msgid "bad component"
msgstr "verkeerde component"
-#: ../dgit:1218
+#: ../dgit:1292
msgid "bad filename"
msgstr "verkeerde bestandsnaam"
-#: ../dgit:1220
+#: ../dgit:1294
msgid "bad sha256sum"
msgstr "verkeerde sha256sum"
-#: ../dgit:1271
+#: ../dgit:1345
msgid "aptget archive query method takes no data part"
msgstr ""
"de methode aptget voor een verzoek aan het archief kent geen data-onderdeel"
-#: ../dgit:1355
+#: ../dgit:1429
#, perl-format
msgid ""
"apt seemed to not to update dgit's cached Release files for %s.\n"
@@ -300,21 +301,21 @@ msgstr ""
" zich op een bestandssysteem dat met `noatime' aangekoppeld is; mocht dit "
"het geval zijn, gebruik dan `relatime'.)\n"
-#: ../dgit:1377
+#: ../dgit:1453
#, perl-format
msgid "Release file (%s) specifies intolerable %s"
msgstr "Release-bestand (%s) vermeldt ontoelaatbaar %s"
-#: ../dgit:1405
+#: ../dgit:1479
msgid "apt-get source did not produce a .dsc"
msgstr "apt-get source produceerde geen .dsc-bestand"
-#: ../dgit:1406
+#: ../dgit:1480
#, perl-format
msgid "apt-get source produced several .dscs (%s)"
msgstr "apt-get source produceerde verschillende .dsc-bestanden (%s)"
-#: ../dgit:1511
+#: ../dgit:1585
#, perl-format
msgid ""
"unable to canonicalise suite using package %s which does not appear to exist "
@@ -323,138 +324,134 @@ msgstr ""
"niet in staat de suite ondubbelzinnig te bepalen met pakket %s dat blijkbaar "
"niet bestaat in suite %s; --existing-package kan behulpzaam zijn"
-#: ../dgit:1702
+#: ../dgit:1724
#, perl-format
msgid "cannot operate on %s suite"
msgstr "kan geen acties uitvoeren op suite %s"
-#: ../dgit:1705
+#: ../dgit:1727
#, perl-format
msgid "canonical suite name for %s is %s"
msgstr "de gebruikelijke suitenaam voor %s is %s"
-#: ../dgit:1707
+#: ../dgit:1729
#, perl-format
msgid "canonical suite name is %s"
msgstr "de gebruikelijke suitenaam is %s"
-#: ../dgit:1727
+#: ../dgit:1749
#, perl-format
msgid "%s has hash %s but archive told us to expect %s"
msgstr "%s heeft hash %s maar volgens het archief moesten we %s verwachten"
-#: ../dgit:1733
+#: ../dgit:1755
#, perl-format
msgid "unsupported source format %s, sorry"
msgstr "niet-ondersteunde broncode-indeling %s, sorry"
-#: ../dgit:1760
+#: ../dgit:1782
#, perl-format
msgid "diverting to %s (using config for %s)"
msgstr "er wordt omgeschakeld naar %s (de configuratie voor %s wordt gebruikt)"
-#: ../dgit:1777
-msgid "unexpected results from git check query - "
-msgstr "het verzoek git check leverde onverwachte resultaten op - "
-
-#: ../dgit:1792
+#: ../dgit:1805
#, perl-format
msgid "unknown git-check `%s'"
msgstr "onbekende git-check `%s'"
-#: ../dgit:1807
+#: ../dgit:1820
#, perl-format
msgid "unknown git-create `%s'"
msgstr "onbekende git-create `%s'"
-#: ../dgit:1844
+#: ../dgit:1857
#, perl-format
msgid "%s: warning: removing from %s: %s\n"
msgstr "%s: waarschuwing: wordt verwijderd van %s: %s\n"
-#: ../dgit:1890
+#: ../dgit:1903
#, perl-format
msgid "could not parse .dsc %s line `%s'"
msgstr "kon .dsc %s regel `%s' niet ontleden"
-#: ../dgit:1901
+#: ../dgit:1914
#, perl-format
msgid "missing any supported Checksums-* or Files field in %s"
msgstr "een ondersteund Checksums-* of Files-veld ontbreekt in %s"
-#: ../dgit:1947
+#: ../dgit:1960
#, perl-format
msgid "hash or size of %s varies in %s fields (between: %s)"
msgstr "hash of grootte van %s varieert in %s-velden (tussen: %s)"
-#: ../dgit:1956
+#: ../dgit:1969
#, perl-format
msgid "file list in %s varies between hash fields!"
msgstr "bestandenlijst in %s varieert tussen hash-velden!"
-#: ../dgit:1960
+#: ../dgit:1973
#, perl-format
msgid "%s has no files list field(s)"
msgstr "%s bevat geen veld(en) met een bestandenlijst"
-#: ../dgit:1966
+#: ../dgit:1979
#, perl-format
msgid "no file appears in all file lists (looked in: %s)"
msgstr "in geen enkele bestandenlijst komt een bestand voor (gezocht in: %s)"
-#: ../dgit:2006
+#: ../dgit:2019
#, perl-format
msgid "purportedly source-only changes polluted by %s\n"
msgstr "ogenschijnlijke source-only wijzigingen vervuild door %s\n"
-#: ../dgit:2019
+#: ../dgit:2032
msgid "cannot find section/priority from .changes Files field"
msgstr ""
"kan sectie/prioriteit niet vinden in het veld Files van het .changes-bestand"
-#: ../dgit:2032
+#: ../dgit:2045
msgid ""
"archive does not support .orig check; hope you used --ch:--sa/-sd if needed\n"
msgstr ""
"archief ondersteunt controle van .orig niet; hopelijk gebruikte u zo nodig --"
"ch:--sa/-sd\n"
-#: ../dgit:2048
+#: ../dgit:2061
#, perl-format
msgid ".dsc %s missing entry for %s"
msgstr ".dsc %s mist een item voor %s"
-#: ../dgit:2053
+#: ../dgit:2066
#, perl-format
msgid "%s: %s (archive) != %s (local .dsc)"
msgstr "%s: %s (archief) != %s (lokale .dsc)"
-#: ../dgit:2061
+#: ../dgit:2074
#, perl-format
msgid "archive %s: %s"
msgstr "archief %s: %s"
-#: ../dgit:2068
+#: ../dgit:2081
#, perl-format
msgid "archive contains %s with different checksum"
msgstr "archief bevat %s met een andere checksum"
-#: ../dgit:2096
+#: ../dgit:2109
#, perl-format
msgid "edited .changes for archive .orig contents: %s %s"
msgstr "bewerkte .changes voor de inhoud van .orig van het archief: %s %s"
-#: ../dgit:2104
+#: ../dgit:2117
#, perl-format
msgid "[new .changes left in %s]"
msgstr "[nieuwe .changes achtergelaten in %s]"
-#: ../dgit:2107
+#: ../dgit:2120
#, perl-format
msgid "%s already has appropriate .orig(s) (if any)"
msgstr "%s heeft reeds passende .orig(s) (indien van toepassing)"
-#: ../dgit:2131
+#: ../dgit:2139
#, perl-format
msgid ""
"unexpected commit author line format `%s' (was generated from changelog "
@@ -463,7 +460,7 @@ msgstr ""
"onverwachte indeling `%s' van de auteursregel van de commit (werd "
"gegenereerd uit het Maintainer-veld in changelog)"
-#: ../dgit:2154
+#: ../dgit:2162
msgid ""
"\n"
"Unfortunately, this source package uses a feature of dpkg-source where\n"
@@ -490,7 +487,7 @@ msgstr ""
"dat verschillende distributies andere broncode hebben).\n"
"\n"
-#: ../dgit:2166
+#: ../dgit:2174
#, perl-format
msgid ""
"Found active distro-specific series file for %s (%s): %s, cannot continue"
@@ -498,24 +495,24 @@ msgstr ""
"Vond een actief distributiespecifiek series-bestand voor %s (%s): %s, kan "
"niet voortgaan"
-#: ../dgit:2197
+#: ../dgit:2205
msgid "Dpkg::Vendor `current vendor'"
msgstr "Dpkg::Vendor `current vendor'"
-#: ../dgit:2199
+#: ../dgit:2207
msgid "(base) distro being accessed"
msgstr "(basis)-distributie wordt benaderd"
-#: ../dgit:2201
+#: ../dgit:2209
msgid "(nominal) distro being accessed"
msgstr "(nominale) distributie wordt benaderd"
-#: ../dgit:2206
+#: ../dgit:2214
#, perl-format
msgid "build-products-dir %s is not accessible: %s\n"
msgstr "build-products-dir %s is niet toegankelijk: %s\n"
-#: ../dgit:2231
+#: ../dgit:2239
#, perl-format
msgid ""
"%s: found orig(s) in .. missing from build-products-dir, transferring:\n"
@@ -523,85 +520,80 @@ msgstr ""
"%s: orig(s) gevonden in .. welke ontbreken in build-products-dir, bezig met "
"overbrengen:\n"
-#: ../dgit:2235
+#: ../dgit:2243
#, perl-format
msgid "check orig file %s in bpd %s: %s"
msgstr "controleer orig-bestand %s in bpd %s: %s"
-#: ../dgit:2237
+#: ../dgit:2245
#, perl-format
msgid "check orig file %s in ..: %s"
msgstr "controleer orig-bestand %s in ..: %s"
-#: ../dgit:2240
+#: ../dgit:2248
#, perl-format
msgid "check target of orig symlink %s in ..: %s"
msgstr "controleer doel van orig-symbolische koppeling %s in ..: %s"
-#: ../dgit:2249
+#: ../dgit:2257
#, perl-format
msgid "%s: cloned orig symlink from ..: %s\n"
msgstr "%s: orig-symbolische koppeling gekloond van ..: %s\n"
-#: ../dgit:2253
+#: ../dgit:2261
#, perl-format
msgid "%s: hardlinked orig from ..: %s\n"
msgstr "%s: vast gekoppelde orig van ..: %s\n"
-#: ../dgit:2256
+#: ../dgit:2264
#, perl-format
msgid "failed to make %s a hardlink to %s: %s"
msgstr "niet gelukt om %s een vaste koppeling naar %s te maken: %s"
-#: ../dgit:2262
+#: ../dgit:2270
#, perl-format
msgid "%s: symmlinked orig from .. on other filesystem: %s\n"
msgstr ""
"%s: symbolisch gekoppelde orig van .. op een ander bestandssysteem: %s\n"
-#: ../dgit:2294 ../dgit:2299
-#, perl-format
-msgid "accessing %s: %s"
-msgstr "bezig met benaderen van %s: %s"
-
-#: ../dgit:2314 ../dgit:2321
-#, perl-format
-msgid "saving %s: %s"
-msgstr "bezig met opslaan van %s: %s"
-
-#: ../dgit:2386
+#: ../dgit:2341
#, perl-format
msgid "dgit (child): exec %s: %s"
msgstr "dgit (dochter): exec %s: %s"
-#: ../dgit:2450 ../dgit:5974
-msgid "source package"
-msgstr "broncodepakket"
-
-#: ../dgit:2468
+#: ../dgit:2403
msgid "package changelog"
msgstr "changelog van het pakket"
-#: ../dgit:2508
+#: ../dgit:2443
msgid "package changelog has no entries!"
msgstr "het changelog-bestand van het pakket bevat geen vermeldingen!"
-#: ../dgit:2527
+#: ../dgit:2512 ../dgit:2517
#, perl-format
-msgid "Import %s"
-msgstr "Importeren van %s"
+msgid "accessing %s: %s"
+msgstr "bezig met benaderen van %s: %s"
-#: ../dgit:2608
+#: ../dgit:2532 ../dgit:2539
+#, perl-format
+msgid "saving %s: %s"
+msgstr "bezig met opslaan van %s: %s"
+
+#: ../dgit:2565 ../dgit:6037
+msgid "source package"
+msgstr "broncodepakket"
+
+#: ../dgit:2643
#, perl-format
msgid "%s: trying slow absurd-git-apply..."
msgstr "%s: langzame absurd-git-apply wordt gebruikt..."
-#: ../dgit:2627
+#: ../dgit:2662
#, perl-format
msgid "%s failed: %s\n"
msgstr "%s mislukte: %s\n"
-#: ../dgit:2636
+#: ../dgit:2671
#, perl-format
msgid ""
"gbp-pq import and dpkg-source disagree!\n"
@@ -614,21 +606,16 @@ msgstr ""
" gbp-pq import gaf boom %s\n"
" dpkg-source --before-build gaf boom %s\n"
-#: ../dgit:2651
+#: ../dgit:2686
#, perl-format
msgid "synthesised git commit from .dsc %s"
msgstr "git commit samengesteld vanuit .dsc %s"
-#: ../dgit:2655
+#: ../dgit:2690
msgid "Import of source package"
msgstr "Importeren van broncodepakket"
-#: ../dgit:2668
-#, perl-format
-msgid "Record %s (%s) in archive suite %s\n"
-msgstr "Gegeven %s (%s) uit archiefsuite %s\n"
-
-#: ../dgit:2672
+#: ../dgit:2710
#, perl-format
msgid ""
"\n"
@@ -641,12 +628,12 @@ msgstr ""
"Laatste versie die met dgit gepusht werd : %s (recentere of dezelfde)\n"
"%s\n"
-#: ../dgit:2714
+#: ../dgit:2752
#, perl-format
msgid "using existing %s"
msgstr "bestaande %s wordt gebruikt"
-#: ../dgit:2718
+#: ../dgit:2756
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (perhaps you should delete this "
@@ -655,12 +642,12 @@ msgstr ""
"bestand %s heeft hash %s maar .dsc vereist hash %s (moet u misschien dit "
"bestand verwijderen?)"
-#: ../dgit:2722
+#: ../dgit:2760
#, perl-format
msgid "need to fetch correct version of %s"
msgstr "moet de juiste versie van %s ophalen met fetch"
-#: ../dgit:2738
+#: ../dgit:2776
#, perl-format
msgid ""
"file %s has hash %s but .dsc demands hash %s (got wrong file from archive!)"
@@ -668,24 +655,24 @@ msgstr ""
"bestand %s heeft hash %s maar .dsc vereist hash %s (verkreeg een verkeerd "
"bestand van het archief!)"
-#: ../dgit:2833
+#: ../dgit:2871
msgid "too many iterations trying to get sane fetch!"
msgstr "te veel pogingen om een foutloze fetch te bekomen!"
-#: ../dgit:2848
+#: ../dgit:2886
#, perl-format
msgid "warning: git ls-remote %s reported %s; this is silly, ignoring it.\n"
msgstr ""
"waarschuwing: git ls-remote %s rapporteerde %s; dit is onzinnig, wordt "
"genegeerd.\n"
-#: ../dgit:2892
+#: ../dgit:2930
#, perl-format
msgid "warning: git fetch %s created %s; this is silly, deleting it.\n"
msgstr ""
"waarschuwing: git fetch %s creëerde %s; dit is onzinnig, wordt verwijderd.\n"
-#: ../dgit:2907
+#: ../dgit:2945
msgid ""
"--dry-run specified but we actually wanted the results of git fetch,\n"
"so this is not going to work. Try running dgit fetch first,\n"
@@ -695,7 +682,7 @@ msgstr ""
"git fetch, dus dit zal niet werken. Probeer eerst git fetch uit te voeren,\n"
"of --damp-run te gebruiken in plaats van --dry-run.\n"
-#: ../dgit:2912
+#: ../dgit:2950
#, perl-format
msgid ""
"warning: git ls-remote suggests we want %s\n"
@@ -711,44 +698,19 @@ msgstr ""
"waarschuwing: Is mogelijk te wijten aan een race met iemand die de server\n"
"waarschuwing: bijwerkt. Zal later opnieuw proberen...\n"
-#: ../dgit:2979
-#, perl-format
-msgid "Not updating %s from %s to %s.\n"
-msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n"
-
-#: ../dgit:3028
-#, perl-format
-msgid "%s: NO git hash"
-msgstr "%s: GEEN hash van git"
-
-#: ../dgit:3032
-#, perl-format
-msgid "%s: specified git info (%s)"
-msgstr "%s: git info werd opgegeven (%s)"
-
-#: ../dgit:3039
-#, perl-format
-msgid "%s: specified git hash"
-msgstr "%s: git hash werd opgegeven"
-
-#: ../dgit:3041
-#, perl-format
-msgid "%s: invalid Dgit info"
-msgstr "%s: ongeldige Dgit info"
-
-#: ../dgit:3063
+#: ../dgit:3097
#, perl-format
msgid "not chasing .dsc distro %s: not fetching %s"
msgstr ""
"ben niet bezig met achter .dsc van distributie %s aan te gaan: %s wordt niet "
"gehaald"
-#: ../dgit:3068
+#: ../dgit:3102
#, perl-format
msgid ".dsc names distro %s: fetching %s"
msgstr ".dsc vernoemt distributie %s: %s wordt opgehaald"
-#: ../dgit:3073
+#: ../dgit:3107
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@ -757,7 +719,7 @@ msgstr ""
"De Dgit-metadata van .dsc zijn in de context van distributie %s\n"
"waarvoor we geen geconfigureerde url hebben en .dsc geeft geen aanwijzing\n"
-#: ../dgit:3083
+#: ../dgit:3117
#, perl-format
msgid ""
".dsc Dgit metadata is in context of distro %s\n"
@@ -770,30 +732,30 @@ msgstr ""
".dsc geeft een aanduiding voor een url met het onveilige protocol %s.\n"
"(kan door de configuratie overschreven worden - raadpleeg de documentatie)\n"
-#: ../dgit:3103
+#: ../dgit:3137
msgid "rewrite map"
msgstr "modificatieplan (rewrite map)"
-#: ../dgit:3110
+#: ../dgit:3144
msgid "server's git history rewrite map contains a relevant entry!"
msgstr ""
"het modificatieplan (rewrite map) van de git-geschiedenis op de server bevat "
"een relevant element!"
-#: ../dgit:3114
+#: ../dgit:3148
msgid "using rewritten git hash in place of .dsc value"
msgstr "de gemodificeerde git hash wordt gebruikt in plaats van de .dsc-waarde"
-#: ../dgit:3116
+#: ../dgit:3150
msgid "server data says .dsc hash is to be disregarded"
msgstr ""
"de gegevens van de server zeggen dat de .dsc-hash genegeerd moet worden"
-#: ../dgit:3123
+#: ../dgit:3157
msgid "additional commits"
msgstr "extra vastleggingen (commits)"
-#: ../dgit:3126
+#: ../dgit:3160
#, perl-format
msgid ""
".dsc Dgit metadata requires commit %s\n"
@@ -802,27 +764,27 @@ msgstr ""
"De Dgit-metadata uit .dsc vereist commit %s\n"
"maar we konden dat object nergens bekomen.\n"
-#: ../dgit:3151
+#: ../dgit:3185
msgid "last upload to archive"
msgstr "laatste upload naar het archief"
-#: ../dgit:3155
+#: ../dgit:3189
msgid "no version available from the archive"
msgstr "geen versie beschikbaar uit het archief"
-#: ../dgit:3238
+#: ../dgit:3272
msgid "dgit suite branch on dgit git server"
msgstr "dgit suite-tak op dgit git-server"
-#: ../dgit:3245
+#: ../dgit:3279
msgid "dgit client's archive history view"
msgstr "dgit - weergave geschiedenis van cliëntarchief"
-#: ../dgit:3250
+#: ../dgit:3284
msgid "Dgit field in .dsc from archive"
msgstr "Dgit-veld in het .dsc uit het archief"
-#: ../dgit:3278
+#: ../dgit:3312
#, perl-format
msgid ""
"\n"
@@ -838,15 +800,15 @@ msgstr ""
"Laatste versie die met dgit gepusht werd: %s\n"
"%s\n"
-#: ../dgit:3291
+#: ../dgit:3325
msgid "archive .dsc names newer git commit"
msgstr ".dsc van het archief vermeldt een recentere git commit"
-#: ../dgit:3294
+#: ../dgit:3328
msgid "archive .dsc names other git commit, fixing up"
msgstr ".dsc van het archief vermeldt een andere git commit, wordt gerepareerd"
-#: ../dgit:3315
+#: ../dgit:3349
#, perl-format
msgid ""
"\n"
@@ -858,7 +820,7 @@ msgstr ""
"dgit.\n"
"%s\n"
-#: ../dgit:3324
+#: ../dgit:3358
#, perl-format
msgid ""
"\n"
@@ -873,7 +835,7 @@ msgstr ""
"Maar we konden geen enkele versie bekomen uit het archief of uit git.\n"
"\n"
-#: ../dgit:3409
+#: ../dgit:3443
#, perl-format
msgid ""
"Record %s (%s) in archive suite %s\n"
@@ -884,19 +846,19 @@ msgstr ""
"\n"
"Gegeven dat\n"
-#: ../dgit:3422
+#: ../dgit:3456
msgid "should be treated as descended from\n"
msgstr "behandeld zou moeten worden als afstammend van\n"
-#: ../dgit:3440
+#: ../dgit:3474
msgid "dgit repo server tip (last push)"
msgstr "tip van de dgit-opslagplaats op de server (laatste push)"
-#: ../dgit:3442
+#: ../dgit:3476
msgid "local tracking tip (last fetch)"
msgstr "tip van de lokale kopie (laatste fetch)"
-#: ../dgit:3453
+#: ../dgit:3487
#, perl-format
msgid ""
"\n"
@@ -912,15 +874,15 @@ msgstr ""
"We waren slechts in staat om %s te bekomen\n"
"\n"
-#: ../dgit:3468
+#: ../dgit:3502
msgid "fetched source tree"
msgstr "broncodeboom opgehaald"
-#: ../dgit:3504
+#: ../dgit:3538
msgid "debian/changelog merge driver"
msgstr "stuurprogramma voor samenvoeging van debian/changelog"
-#: ../dgit:3569
+#: ../dgit:3603
msgid ""
"[attr]dgit-defuse-attrs already found, and proper, in .git/info/attributes\n"
" not doing further gitattributes setup\n"
@@ -928,16 +890,16 @@ msgstr ""
"[attr]dgit-defuse-attrs reeds gevonden in .git/info/attributes, en geschikt\n"
" gitattributes wordt niet verder ingesteld\n"
-#: ../dgit:3583
+#: ../dgit:3617
msgid "# ^ see GITATTRIBUTES in dgit(7) and dgit setup-new-tree in dgit(1)\n"
msgstr "# ^ zie GITATTRIBUTES in dgit(7) en dgit setup-new-tree in dgit(1)\n"
-#: ../dgit:3598
+#: ../dgit:3632
#, perl-format
msgid "install %s: %s"
msgstr "installeren van %s: %s"
-#: ../dgit:3625
+#: ../dgit:3659
#, perl-format
msgid ""
"dgit: warning: %s contains .gitattributes\n"
@@ -948,32 +910,32 @@ msgstr ""
"dgit: .gitattributes niet (volledig) geneutraliseerd. Aanbevolen: dgit "
"setup-new-tree.\n"
-#: ../dgit:3647
+#: ../dgit:3681
#, perl-format
msgid "fetching %s..."
msgstr "ophalen van %s..."
-#: ../dgit:3655
+#: ../dgit:3689
#, perl-format
msgid "failed to obtain %s: %s"
msgstr "verkrijgen van %s mislukte: %s"
-#: ../dgit:3694
+#: ../dgit:3728
#, perl-format
msgid "package %s missing in (base suite) %s"
msgstr "pakket %s ontbreekt in (basissuite) %s"
-#: ../dgit:3726
+#: ../dgit:3760
msgid "local combined tracking branch"
msgstr "lokale gecombineerde navolgende tak (tracking branch)"
-#: ../dgit:3728
+#: ../dgit:3762
msgid "archive seems to have rewound: local tracking branch is ahead!"
msgstr ""
"het archief lijkt teruggespoeld te hebben: de lokale navolgende tak loopt "
"voorop!"
-#: ../dgit:3767
+#: ../dgit:3801
#, perl-format
msgid ""
"Combine archive branches %s [dgit]\n"
@@ -984,7 +946,7 @@ msgstr ""
"\n"
"Invoertakken:\n"
-#: ../dgit:3781
+#: ../dgit:3815
msgid ""
"\n"
"Key\n"
@@ -998,34 +960,34 @@ msgstr ""
" + markeert elke tak die niet reeds een voorouder was\n"
"\n"
-#: ../dgit:3796
+#: ../dgit:3830
#, perl-format
msgid "calculated combined tracking suite %s"
msgstr "berekende gecombineerde navolgende suite %s"
-#: ../dgit:3814
+#: ../dgit:3848
#, perl-format
msgid "ready for work in %s"
msgstr "klaar om te werken in %s"
-#: ../dgit:3822
+#: ../dgit:3866
msgid "dry run makes no sense with clone"
msgstr "dry run is zinloos met clone"
-#: ../dgit:3837
+#: ../dgit:3881
#, perl-format
msgid "create `%s': %s"
msgstr "creëren van `%s': %s"
-#: ../dgit:3853
+#: ../dgit:3893
msgid "fetching existing git history"
msgstr "ophalen van bestaande git-geschiedenis"
-#: ../dgit:3857
+#: ../dgit:3896
msgid "starting new git history"
msgstr "starten van een nieuwe git-geschiedenis"
-#: ../dgit:3883
+#: ../dgit:3921
#, perl-format
msgid ""
"FYI: Vcs-Git in %s has different url to your vcs-git remote.\n"
@@ -1035,33 +997,33 @@ msgstr ""
" De url voor uw externe vcs-git zou verouderd kunnen zijn. Misschien dgit "
"update-vcs-git gebruiken?\n"
-#: ../dgit:3888
+#: ../dgit:3926
#, perl-format
msgid "fetched into %s"
msgstr "opgehaald naar %s"
-#: ../dgit:3900
+#: ../dgit:3938
#, perl-format
msgid "Merge from %s [dgit]"
msgstr "Samenvoegen vanuit %s [dgit]"
-#: ../dgit:3902
+#: ../dgit:3940
#, perl-format
msgid "fetched to %s and merged into HEAD"
msgstr "opgehaald naar %s samengevoegd naar HEAD"
-#: ../dgit:3910
+#: ../dgit:3948
#, perl-format
msgid "git tree contains %s"
msgstr "git-boom bevat %s"
-#: ../dgit:3921
+#: ../dgit:3959
msgid "you have uncommitted changes to critical files, cannot continue:\n"
msgstr ""
"u heeft niet-vastgelegde wijzigingen in cruciale bestanden, kan niet "
"voortgaan:\n"
-#: ../dgit:3940
+#: ../dgit:3978
#, perl-format
msgid ""
"quilt fixup required but quilt mode is `nofix'\n"
@@ -1070,15 +1032,15 @@ msgstr ""
"er is een quilt fixup vereist, maar de quilt-modus is `nofix'\n"
"HEAD commit%s verschilt van de boom die uit debian/patches%s volgt"
-#: ../dgit:3957
+#: ../dgit:3995
msgid "nothing quilty to commit, ok."
msgstr "niets quilt-achtig vast te leggen, oké."
-#: ../dgit:3960
+#: ../dgit:3998
msgid " (wanted to commit patch update)"
msgstr " (wilde een patch-update vastleggen)"
-#: ../dgit:3964
+#: ../dgit:4002
msgid ""
"Commit Debian 3.0 (quilt) metadata\n"
"\n"
@@ -1086,7 +1048,7 @@ msgstr ""
"Vastleggen van (commit) Debian 3.0 (quilt) metadata\n"
"\n"
-#: ../dgit:4007
+#: ../dgit:4046
#, perl-format
msgid ""
"Not doing any fixup of `%s' due to ----no-quilt-fixup or --quilt=nocheck"
@@ -1094,60 +1056,60 @@ msgstr ""
"Opknappen van `%s' wordt niet gedaan, wegens ----no-quilt-fixup of --"
"quilt=nocheck"
-#: ../dgit:4012
+#: ../dgit:4051
#, perl-format
msgid "Format `%s', need to check/update patch stack"
msgstr "Indeling `%s', moet de patch-stack nakijken/bijwerken"
-#: ../dgit:4022
+#: ../dgit:4061
#, perl-format
msgid "commit id %s"
msgstr "vastleggings-id (commit id) %s"
-#: ../dgit:4028
+#: ../dgit:4067
#, perl-format
msgid "and left in %s"
msgstr "en achtergelaten in %s"
-#: ../dgit:4054
+#: ../dgit:4093
#, perl-format
msgid "Wanted tag %s (%s) on dgit server, but not found\n"
msgstr "Wenste tag %s (%s) op de dgit-server, maar niet gevonden\n"
-#: ../dgit:4057
+#: ../dgit:4096
#, perl-format
msgid "Wanted tag %s (one of: %s) on dgit server, but not found\n"
msgstr "Wenste tag %s (één van: %s) op de dgit-server, maar niet gevonden\n"
-#: ../dgit:4065
+#: ../dgit:4104
#, perl-format
msgid "%s (%s) .. %s (%s) is not fast forward\n"
msgstr ""
"%s (%s) .. %s (%s) is niet fast forward (geen lineaire "
"veranderingsgeschiedenis)\n"
-#: ../dgit:4074
+#: ../dgit:4113
msgid "version currently in archive"
msgstr "momenteel in het archief aanwezige versie"
-#: ../dgit:4083
+#: ../dgit:4122
#, perl-format
msgid "Checking package changelog for archive version %s ..."
msgstr ""
"Het changlog-bestand van het pakket wordt gecontroleerd op archiefversie "
"%s ..."
-#: ../dgit:4091
+#: ../dgit:4130
#, perl-format
msgid "%s field from dpkg-parsechangelog %s"
msgstr "veld %s van dpkg-parsechangelog %s"
-#: ../dgit:4101
+#: ../dgit:4141
#, perl-format
msgid "Perhaps debian/changelog does not mention %s ?"
msgstr "Vermeldt debian/changelog misschien %s niet?"
-#: ../dgit:4104
+#: ../dgit:4144
#, perl-format
msgid ""
"%s is %s\n"
@@ -1156,547 +1118,99 @@ msgstr ""
"%s is %s\n"
"Uw boom lijkt gebaseerd op een eerdere (niet geüploade) %s.\n"
-#: ../dgit:4118
+#: ../dgit:4158
#, perl-format
msgid "Declaring that HEAD includes all changes in %s..."
msgstr "Bezig te verklaren dat HEAD alle wijzigingen uit %s omvat..."
-#: ../dgit:4174
+#: ../dgit:4214
msgid "Checking that HEAD includes all changes in archive..."
msgstr ""
"Bezig te controleren dat HEAD alle wijzigingen uit het archief omvat..."
-#: ../dgit:4183
+#: ../dgit:4223
msgid "maintainer view tag"
msgstr "tag weergave pakketonderhouder"
-#: ../dgit:4185
+#: ../dgit:4225
msgid "dgit view tag"
msgstr "tag weergave dgit"
-#: ../dgit:4186
+#: ../dgit:4226
msgid "current archive contents"
msgstr "huidige inhoud van het archief"
-#: ../dgit:4199
+#: ../dgit:4239
msgid ""
"| Not fast forward; maybe --overwrite is needed ? Please see dgit(1).\n"
msgstr ""
"| Niet fast forward (geen lineaire geschiedenis); is misschien --overwrite "
"nodig? Raadpleeg dgit(1).\n"
-#: ../dgit:4209
+#: ../dgit:4249
#, perl-format
msgid "Declare fast forward from %s\n"
msgstr "Lineair (fast forward) declareren vanuit %s\n"
-#: ../dgit:4210
+#: ../dgit:4250
#, perl-format
msgid "Make fast forward from %s\n"
msgstr "Lineair (fast forward) maken vanuit %s\n"
-#: ../dgit:4214
+#: ../dgit:4254
#, perl-format
msgid "Made pseudo-merge of %s into dgit view."
msgstr "Maakte een pseudo-samenvoeging van %s in de dgit-weergave."
-#: ../dgit:4227
+#: ../dgit:4267
#, perl-format
msgid "Declare fast forward from %s"
msgstr "Lineair (fast forward) declareren vanuit %s"
-#: ../dgit:4235
+#: ../dgit:4275
#, perl-format
msgid "Make pseudo-merge of %s into your HEAD."
msgstr "Pseudo-samenvoeging maken van %s naar uw HEAD."
-#: ../dgit:4247
+#: ../dgit:4287
#, perl-format
msgid "-p specified %s but changelog specified %s"
msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s"
-#: ../dgit:4269
+#: ../dgit:4309
#, perl-format
msgid "%s is for %s %s but debian/changelog is for %s %s"
msgstr "%s is voor %s %s maar debian/changelog is voor %s %s"
-#: ../dgit:4330
+#: ../dgit:4363
#, perl-format
msgid "changes field %s `%s' does not match changelog `%s'"
msgstr "het changes-veld %s `%s' komt niet overeen met `%s' uit changelog"
-#: ../dgit:4358
-#, perl-format
-msgid "%s release %s for %s (%s) [dgit]\n"
-msgstr "%s release %s voor %s (%s) [dgit]\n"
-
-#: ../dgit:4371
-#, perl-format
-msgid ""
-"%s release %s for %s (%s)\n"
-"(maintainer view tag generated by dgit --quilt=%s)\n"
-msgstr ""
-"%s release %s voor %s (%s)\n"
-"(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n"
-
-#: ../dgit:4423
-msgid ""
-"Push failed, while checking state of the archive.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-"Push mislukte tijdens het nagaan van de toestand van het archief.\n"
-"Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het "
-"probleem.\n"
-
-#: ../dgit:4432
-msgid ""
-"package appears to be new in this suite; if this is intentional, use --new"
-msgstr ""
-"het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling is, "
-"gebruik dan --new"
-
-#: ../dgit:4437
-msgid ""
-"Push failed, while preparing your push.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-"Push mislukte tijdens het voorbereiden van uw push.\n"
-"Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het "
-"probleem.\n"
-
-#: ../dgit:4460
-#, perl-format
-msgid "looked for .dsc %s, but %s; maybe you forgot to build"
-msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen"
-
-#: ../dgit:4477
-#, perl-format
-msgid ""
-"Branch is managed by git-debrebase (%s\n"
-"exists), but quilt mode (%s) implies a split view.\n"
-"Pass the right --quilt option or adjust your git config.\n"
-"Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
-msgstr ""
-"Tak wordt beheerd door git-debrebase (%s\n"
-"bestaat), maar de quilt-modus (%s) impliceert een gesplitste weergave.\n"
-"Gebruik de juiste --quilt-optie of pas uw git config aan.\n"
-"Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n"
-
-#: ../dgit:4501
-#, perl-format
-msgid ""
-"--quilt=%s but no cached dgit view:\n"
-" perhaps HEAD changed since dgit build[-source] ?"
-msgstr ""
-"--quilt=%s maar geen gecachete dgit-weergave:\n"
-" werd HEAD misschien gewijzigd sinds dgit build[-source]?"
-
-#: ../dgit:4532
-msgid ""
-"dgit push: HEAD is not a descendant of the archive's version.\n"
-"To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
-"To rewind history, if permitted by the archive, use --deliberately-not-fast-"
-"forward."
-msgstr ""
-"dgit push: HEAD is geen afstammeling van de versie van het archief.\n"
-"Om de inhoud van het archief te overschrijven, geeft u de opdracht --"
-"overwrite[=VERSIE].\n"
-"Om de geschiedenis terug te spoelen, als het archief dat toestaat, gebruikt "
-"u --deliberately-not-fast-forward."
-
-#: ../dgit:4542
-#, perl-format
-msgid "checking that %s corresponds to HEAD"
-msgstr "bezig na te gaan dat %s overeenkomt met HEAD"
-
-#: ../dgit:4576 ../dgit:4588
-#, perl-format
-msgid "HEAD specifies a different tree to %s:\n"
-msgstr "HEAD geeft een andere boom op aan %s:\n"
-
-#: ../dgit:4582
-#, perl-format
-msgid ""
-"There is a problem with your source tree (see dgit(7) for some hints).\n"
-"To see a full diff, run git diff %s %s\n"
-msgstr ""
-"Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n"
-"Om alle verschillen te zien, gebruikt u git diff %s %s\n"
-
-#: ../dgit:4592
-#, perl-format
-msgid ""
-"Perhaps you forgot to build. Or perhaps there is a problem with your\n"
-" source tree (see dgit(7) for some hints). To see a full diff, run\n"
-" git diff %s %s\n"
-msgstr ""
-"Misschien vergat u te bouwen (build). Of er is misschien een probleem met\n"
-" uw broncodeboom (zie dgit(7) voor suggesties). Om alle verschillen te "
-"zien,\n"
-" gebruikt u git diff %s %s\n"
-
-#: ../dgit:4603
-#, perl-format
-msgid ""
-"failed to find unique changes file (looked for %s in %s); perhaps you need "
-"to use dgit -C"
-msgstr ""
-"kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien moet "
-"u dgit -C gebruiken"
-
-#: ../dgit:4625
-msgid "uploading binaries, although distro policy is source only"
-msgstr ""
-"bezig met uploaden van binaire pakketten, hoewel het beleid van de "
-"distributie uitsluitend broncode (source only) voorschrijft"
-
-#: ../dgit:4629
-msgid "source-only upload, although distro policy requires .debs"
-msgstr ""
-"upload van uitsluitend broncode (source-only), hoewel het beleid van de "
-"distributie .deb's vereist"
-
-#: ../dgit:4633
-#, perl-format
-msgid ""
-"source-only upload, even though package is entirely NEW\n"
-"(this is contrary to policy in %s)"
-msgstr ""
-"upload van uitsluitend broncode (source-only), hoewel pakket volledig NIEUW "
-"is\n"
-"(dit is in tegenspraak met de beleidsrichtlijnen in %s)"
-
-#: ../dgit:4640
-#, perl-format
-msgid "unknown source-only-uploads policy `%s'"
-msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'"
-
-#: ../dgit:4684
-msgid ""
-"Push failed, while signing the tag.\n"
-"You can retry the push, after fixing the problem, if you like.\n"
-msgstr ""
-"Push mislukte tijdens het ondertekenen van de tag.\n"
-"Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van het "
-"probleem.\n"
-
-#: ../dgit:4697
-msgid ""
-"Push failed, *after* signing the tag.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-"Push mislukte *na* het ondertekenen van de tag.\n"
-"Indien u opnieuw wenst te proberen, moet u een nieuw versienummer "
-"gebruiken.\n"
-
-#: ../dgit:4714
-msgid ""
-"Push failed, while updating the remote git repository - see messages above.\n"
-"If you want to try again, you should use a new version number.\n"
-msgstr ""
-"Push mislukte tijdens het bijwerken van de externe git-opslagplaats - zie de "
-"meldingen hierboven.\n"
-"Indien u opnieuw wenst te proberen, moet u een nieuw versienummer "
-"gebruiken.\n"
-
-#: ../dgit:4731
-msgid ""
-"Push failed, while obtaining signatures on the .changes and .dsc.\n"
-"If it was just that the signature failed, you may try again by using\n"
-"debsign by hand to sign the changes file (see the command dgit tried,\n"
-"above), and then dput that changes file to complete the upload.\n"
-"If you need to change the package, you must use a new version number.\n"
-msgstr ""
-"Push mislukte bij het verkrijgen van de ondertekening van .changes en .dsc.\n"
-"Indien het louter een mislukte ondertekening betreft, kunt u opnieuw "
-"proberen\n"
-"door handmatig het changes-bestand te ondertekenen met debsign (zie "
-"hierboven\n"
-"welk commando dgit gebruikte) en vervolgens het changes-bestand te uploaden\n"
-"met dput om zo de upload te vervolledigen.\n"
-"Indien u het pakket moet aanpassen, moet u een nieuw versienummer "
-"gebruiken.\n"
-
-#: ../dgit:4762
-#, perl-format
-msgid "pushed and uploaded %s"
-msgstr "%s gepusht en geüpload"
-
-#: ../dgit:4774
-msgid "-p is not allowed with clone; specify as argument instead"
-msgstr ""
-"-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op als "
-"argument"
-
-#: ../dgit:4785
-msgid "incorrect arguments to dgit clone"
-msgstr "incorrecte argumenten voor dgit clone"
-
-#: ../dgit:4791 ../git-debrebase:1839
-#, perl-format
-msgid "%s already exists"
-msgstr "%s bestaat reeds"
-
-#: ../dgit:4805
-#, perl-format
-msgid "remove %s: %s\n"
-msgstr "verwijder %s: %s\n"
-
-#: ../dgit:4809
-#, perl-format
-msgid "check whether to remove %s: %s\n"
-msgstr "controleer of %s moet verwijderd worden: %s\n"
-
-#: ../dgit:4847
-msgid "incorrect arguments to dgit fetch or dgit pull"
-msgstr "incorrecte argumenten voor dgit fetch of dgit pull"
-
-#: ../dgit:4864
-#, perl-format
-msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
-msgstr ""
-"dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet "
-"ondersteund\n"
-
-#: ../dgit:4873
-msgid "dgit checkout needs a suite argument"
-msgstr "dgit checkout heeft een suite nodig als argument"
-
-#: ../dgit:4935
-#, perl-format
-msgid "setting up vcs-git: %s\n"
-msgstr "bezig met opzetten van vcs-git: %s\n"
-
-#: ../dgit:4938
-#, perl-format
-msgid "vcs git already configured: %s\n"
-msgstr "vcs git is reeds geconfigureerd: %s\n"
-
-#: ../dgit:4940
-#, perl-format
-msgid "changing vcs-git url to: %s\n"
-msgstr "url van vcs-git wordt veranderd naar: %s\n"
-
-#: ../dgit:4945
-#, perl-format
-msgid "fetching (%s)\n"
-msgstr "bezig met ophalen (%s)\n"
-
-#: ../dgit:4960
-#, perl-format
-msgid "incorrect arguments to dgit %s"
-msgstr "incorrecte argumenten voor dgit %s"
-
-#: ../dgit:4971
-#, perl-format
-msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
-msgstr ""
-"dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel "
-"wordt %s opgegeven"
-
-#: ../dgit:5009
-#, perl-format
-msgid ""
-"build host has dgit rpush protocol versions %s but invocation host has %s"
-msgstr ""
-"de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die van "
-"de aanroepende computer zijn %s"
-
-#: ../dgit:5089
-#, perl-format
-msgid "create %s: %s"
-msgstr "maak %s aan: %s"
-
-#: ../dgit:5126
-#, perl-format
-msgid "build host child failed: %s"
-msgstr "dochterproces op de bouwcomputer faalde: %s"
-
-#: ../dgit:5129
-msgid "all done\n"
-msgstr "alles klaar\n"
-
-#: ../dgit:5138
-#, perl-format
-msgid "file %s (%s) twice"
-msgstr "bestand %s (%s) tweemaal"
-
-#: ../dgit:5146
-msgid "bad param spec"
-msgstr "slechte parameter-spec"
-
-#: ../dgit:5152
-msgid "bad previously spec"
-msgstr "slechte vroegere spec"
-
-#: ../dgit:5171
-#, perl-format
-msgid ""
-"rpush negotiated protocol version %s which does not support quilt mode %s"
-msgstr ""
-"de onderhandeling van rpush leverde protocolversie %s op, welke quilt-modus "
-"%s niet ondersteunt"
-
-#: ../dgit:5216
-#, perl-format
-msgid "buildinfo mismatch in field %s"
-msgstr "buildinfo-incongruentie in veld %s"
-
-#: ../dgit:5219
-#, perl-format
-msgid "buildinfo contains forbidden field %s"
-msgstr "buildinfo bevat ongeoorloofd veld %s"
-
-#: ../dgit:5260
-msgid "remote changes file"
-msgstr "extern changes-bestand"
-
-#: ../dgit:5335
-msgid "not a plain file or symlink\n"
-msgstr "geen echt bestand of symbolische koppeling\n"
-
-#: ../dgit:5341
-msgid "mode or type changed\n"
-msgstr "modus of type gewijzigd\n"
-
-#: ../dgit:5342
-msgid "modified symlink\n"
-msgstr "symbolische koppeling gewijzigd\n"
-
-#: ../dgit:5345
-msgid "deletion of symlink\n"
-msgstr "verwijdering van symbolische koppeling\n"
-
-#: ../dgit:5349
-msgid "creation with non-default mode\n"
-msgstr "creatie met een niet-standaard modus\n"
-
-#: ../dgit:5379
-msgid "dgit view: changes are required..."
-msgstr "dgit-weergave: er zijn wijzigingen vereist..."
-
-#: ../dgit:5408
-#, perl-format
-msgid ""
-"\n"
-"For full diff showing the problem(s), type:\n"
-" %s\n"
-msgstr ""
-"\n"
-"Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n"
-" %s\n"
-
-#: ../dgit:5415
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-unapplied git tree\n"
-" but git tree differs from orig in upstream files."
-msgstr ""
-"--quilt=%s opgegeven, hetgeen een patches-unapplied git tree impliceert\n"
-" (een git-boom zonder dat de patches toegepast worden)\n"
-" maar de git-boom verschilt van orig in de toeleveraarsbestanden."
-
-#: ../dgit:5421
-msgid ""
-"\n"
-" ... debian/patches is missing; perhaps this is a patch queue branch?"
-msgstr ""
-"\n"
-" ... debian/patches ontbreekt; is dit misschien een tak met een patch-"
-"wachtrij?"
-
-#: ../dgit:5428
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying patches-applied git tree\n"
-" but git tree differs from result of applying debian/patches to upstream\n"
-msgstr ""
-"--quilt=%s opgegeven, hetgeen een patches-applied git tree impliceert\n"
-" (een git-boom met toegepaste patches)\n"
-" maar de git-boom verschilt van het resultaat van het toepassen van\n"
-" debian/patches op de broncode van de toeleveraar.\n"
-
-#: ../dgit:5435
-msgid "dgit view: creating patches-applied version using gbp pq"
-msgstr ""
-"dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt"
-
-#: ../dgit:5444
-#, perl-format
-msgid ""
-"--quilt=%s specified, implying that HEAD is for use with a\n"
-" tool which does not create patches for changes to upstream\n"
-" .gitignores: but, such patches exist in debian/patches.\n"
-msgstr ""
-"--quilt=%s werd opgegeven, hetgeen inhoudt dat HEAD bedoeld is om gebruikt\n"
-" te worden met een hulpmiddel dat geen patches maakt om .gitignores van de\n"
-" toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke patches.\n"
-
-#: ../dgit:5453
-msgid "dgit view: creating patch to represent .gitignore changes"
-msgstr ""
-"dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore te "
-"representeren"
-
-#: ../dgit:5458
-#, perl-format
-msgid "%s already exists; but want to create it to record .gitignore changes"
-msgstr ""
-"%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore op "
-"te tekenen"
-
-#: ../dgit:5463
-msgid ""
-"Subject: Update .gitignore from Debian packaging branch\n"
-"\n"
-"The Debian packaging git branch contains these updates to the upstream\n"
-".gitignore file(s). This patch is autogenerated, to provide these\n"
-"updates to users of the official Debian archive view of the package.\n"
-msgstr ""
-"Onderwerp: Bijwerken van .gitignore vanuit de Debian pakketbouw-tak\n"
-"\n"
-"De git-tak met het Debian pakket bevat deze bijwerkingen aan het/de\n"
-".gitignore-bestand(en) van de toeleveraar. Deze patch werd automatisch\n"
-"gegenereerd om deze updates ter beschikking te stellen van gebruikers van\n"
-"de weergave van het pakket uit het officiële Debian-archief.\n"
-
-#: ../dgit:5485
-msgid "Commit patch to update .gitignore\n"
-msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n"
-
-#: ../dgit:5499
-msgid "converted"
-msgstr "omgezet"
-
-#: ../dgit:5500
-#, perl-format
-msgid "dgit view: created (%s)"
-msgstr "dgit-weergave: gecreëerd: (%s)"
-
-#: ../dgit:5565
+#: ../dgit:5609
msgid "maximum search space exceeded"
msgstr "maximale zoekruimte overschreden"
-#: ../dgit:5583
+#: ../dgit:5627
#, perl-format
msgid "has %s not %s"
msgstr "bevat %s, niet %s"
-#: ../dgit:5592
+#: ../dgit:5636
msgid "root commit"
msgstr "beginvastlegging (root commit)"
-#: ../dgit:5598
+#: ../dgit:5642
#, perl-format
msgid "merge (%s nontrivial parents)"
msgstr "samenvoeging (merge) (%s niet-triviale ouders)"
-#: ../dgit:5610
+#: ../dgit:5654
#, perl-format
msgid "changed %s"
msgstr "gewijzigd: %s"
-#: ../dgit:5629
+#: ../dgit:5673
#, perl-format
msgid ""
"\n"
@@ -1705,23 +1219,23 @@ msgstr ""
"\n"
"%s: fout: een quilt fixup kan niet lineair zijn. Gestopt bij:\n"
-#: ../dgit:5636
+#: ../dgit:5680
#, perl-format
msgid "%s: %s: %s\n"
msgstr "%s: %s: %s\n"
-#: ../dgit:5648
+#: ../dgit:5692
msgid "quilt history linearisation failed. Search `quilt fixup' in dgit(7).\n"
msgstr ""
"lineair maken van de quilt-geschiedenis mislukte. Zoek naar `quilt fixup' in "
"dgit(7).\n"
-#: ../dgit:5651
+#: ../dgit:5695
msgid "quilt fixup cannot be linear, smashing..."
msgstr ""
"de quilt fixup kan niet lineair zijn, de smash strategie wordt gebruikt..."
-#: ../dgit:5663
+#: ../dgit:5707
#, perl-format
msgid ""
"Automatically generated patch (%s)\n"
@@ -1732,72 +1246,88 @@ msgstr ""
"Laatste (tot en met) %s git-wijzigingen, ter informatie:\n"
"\n"
-#: ../dgit:5670
+#: ../dgit:5714
msgid "quiltify linearisation planning successful, executing..."
msgstr "linearisatieplanning voor quiltify was succesvol, wordt uitgevoerd..."
-#: ../dgit:5704
+#: ../dgit:5748
msgid "contains unexpected slashes\n"
msgstr "bevat onverwachte slashes\n"
-#: ../dgit:5705
+#: ../dgit:5749
msgid "contains leading punctuation\n"
msgstr "bevat leestekens aan het begin\n"
-#: ../dgit:5706
+#: ../dgit:5750
msgid "contains bad character(s)\n"
msgstr "bevat foutieve teken(s)\n"
-#: ../dgit:5707
+#: ../dgit:5751
msgid "is series file\n"
msgstr "is een series-bestand\n"
-#: ../dgit:5708
+#: ../dgit:5752
msgid "too long\n"
msgstr "te lang\n"
-#: ../dgit:5712
+#: ../dgit:5756
#, perl-format
msgid "quiltifying commit %s: ignoring/dropping Gbp-Pq %s: %s"
msgstr ""
"quiltifying commit (quiltificerende vastlegging) %s: Gbp-Pq %s wordt "
"genegeerd/weggelaten: %s"
-#: ../dgit:5741
+#: ../dgit:5785
#, perl-format
msgid "dgit: patch title transliteration error: %s"
msgstr "dgit: fout bij de transliteratie van de patch-titel: %s"
-#: ../dgit:5884
+#: ../dgit:5868
+#, perl-format
+msgid ""
+"quilt mode %s does not make sense (or is not supported) with single-debian-"
+"patch"
+msgstr ""
+
+#: ../dgit:5886
+msgid "converted"
+msgstr "omgezet"
+
+#: ../dgit:5887
+#, perl-format
+msgid "dgit view: created (%s)"
+msgstr "dgit-weergave: gecreëerd: (%s)"
+
+#: ../dgit:5941
msgid "Commit removal of .pc (quilt series tracking data)\n"
msgstr ""
"Vastleggingsverwijdering (commit removal) van .pc (quilt-seriegegevens)\n"
-#: ../dgit:5894
+#: ../dgit:5951
msgid "starting quiltify (single-debian-patch)"
msgstr "quiltify wordt gestart (één enkele debian-patch)"
-#: ../dgit:5996
+#: ../dgit:6061
#, perl-format
msgid "dgit: split brain (separate dgit view) may be needed (--quilt=%s)."
msgstr ""
"dgit: gespleten brein (aparte dgit-weergave) is mogelijk nodig (--quilt=%s)."
-#: ../dgit:6027
+#: ../dgit:6093
#, perl-format
msgid "dgit view: found cached (%s)"
msgstr "dgit-weergave: gecachete (%s) aangetroffen"
-#: ../dgit:6032
+#: ../dgit:6098
msgid "dgit view: found cached, no changes required"
msgstr "dgit-weergave: gecachete aangetroffen, geen wijzigingen vereist"
-#: ../dgit:6043
+#: ../dgit:6133
#, perl-format
msgid "examining quilt state (multiple patches, %s mode)"
msgstr "toestand van quilt wordt nagegaan (meerdere patches, %s-modus)"
-#: ../dgit:6134
+#: ../dgit:6247
msgid ""
"failed to apply your git tree's patch stack (from debian/patches/) to\n"
" the corresponding upstream tarball(s). Your source tree and .orig\n"
@@ -1811,67 +1341,96 @@ msgstr ""
" dgit can enkel bepaalde soorten anomalieën repareren\n"
" (afhankelijk van de quilt-modus). Raadpleeg --quilt= in dgit(1).\n"
-#: ../dgit:6148
+#: ../dgit:6261
msgid "Tree already contains .pc - will use it then delete it."
msgstr "Boom bevat reeds een .pc - zal dit gebruiken en dan verwijderen."
-#: ../dgit:6185
+#: ../dgit:6295
+msgid "baredebian quilt fixup: could not find any origs"
+msgstr ""
+
+#: ../dgit:6308
+msgid "tarball"
+msgstr ""
+
+#: ../dgit:6326
+#, perl-format
+msgid "Combine orig tarballs for %s %s"
+msgstr ""
+
+#: ../dgit:6342
+msgid "tarballs"
+msgstr ""
+
+#: ../dgit:6356
+msgid "upstream"
+msgstr ""
+
+#: ../dgit:6380
#, perl-format
msgid "%s: base trees orig=%.20s o+d/p=%.20s"
msgstr "%s: van de basisbomen zijn orig=%.20s en o+d/p=%.20s"
-#: ../dgit:6188
-#, perl-format
+#: ../dgit:6390
+#, fuzzy, perl-format
+#| msgid ""
+#| "%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
+#| "%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
msgid ""
"%s: quilt differences: src: %s orig %s gitignores: %s orig %s\n"
-"%s: quilt differences: HEAD %s o+d/p HEAD %s o+d/p"
+"%s: quilt differences: %9.00009s %s o+d/p %9.00009s %s o+d/p"
msgstr ""
"%s: quilt-verschillen: src: %s orig %s gitignores: %s orig %s\n"
"%s: quilt-verschillen: HEAD %s o+d/p HEAD %s o+d/p"
-#: ../dgit:6194
+#: ../dgit:6399
#, perl-format
msgid "dgit: cannot represent change: %s: %s\n"
msgstr "dgit: kan wijziging niet representeren: %s: %s\n"
-#: ../dgit:6198
+#: ../dgit:6403
msgid ""
"HEAD has changes to .orig[s] which are not representable by `3.0 (quilt)'\n"
msgstr ""
"HEAD bevat wijzigingen aan .orig[s] welke niet door `3.0 (quilt)' vertolkt "
"kunnen worden\n"
-#: ../dgit:6205
+#: ../dgit:6410
+msgid ""
+"This has only a debian/ directory; you probably want --quilt=bare debian."
+msgstr ""
+
+#: ../dgit:6414
msgid "This might be a patches-unapplied branch."
msgstr "Dit is mogelijk een tak zonder toepassing van patches."
-#: ../dgit:6208
+#: ../dgit:6417
msgid "This might be a patches-applied branch."
msgstr "Dit is mogelijk een tak met toegepaste patches."
-#: ../dgit:6211
+#: ../dgit:6420
msgid "Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ?"
msgstr ""
"Heeft u mogelijk een van de volgende opties nodig: --[quilt=]gbp --"
"[quilt=]dpm --quilt=unapplied ?"
-#: ../dgit:6214
+#: ../dgit:6423
msgid "Warning: Tree has .gitattributes. See GITATTRIBUTES in dgit(7)."
msgstr ""
"Waarschuwing: Boom bevat .gitattributes. Zie GITATTRIBUTES in dgit(7)."
-#: ../dgit:6218
+#: ../dgit:6427
msgid "Maybe orig tarball(s) are not identical to git representation?"
msgstr ""
"Is/zijn het/de orig-tararchie(f)(ven) misschien niet identiek aan de "
"representatie ervan door git?"
-#: ../dgit:6227
+#: ../dgit:6438
#, perl-format
msgid "starting quiltify (multiple patches, %s mode)"
msgstr "quiltify wordt gestart (meerdere patches, %s-modus)"
-#: ../dgit:6265
+#: ../dgit:6477
msgid ""
"\n"
"dgit: Building, or cleaning with rules target, in patches-unapplied tree.\n"
@@ -1886,13 +1445,13 @@ msgstr ""
"dgit: (Overweeg het gebruik van --clean=git en (of) dgit sbuild.)\n"
"\n"
-#: ../dgit:6277
+#: ../dgit:6489
msgid "dgit: Unapplying patches again to tidy up the tree."
msgstr ""
"dgit: Bezig toepassen van patches terug ongedaan te maken om de boom op te "
"schonen."
-#: ../dgit:6306
+#: ../dgit:6518
msgid ""
"If this is just missing .gitignore entries, use a different clean\n"
"mode, eg --clean=dpkg-source,no-check (-wdn/-wddn) to ignore them\n"
@@ -1904,18 +1463,18 @@ msgstr ""
"negeren, of --clean=git (-wg/-wgf) om in de plaats `git clean' te "
"gebruiken.\n"
-#: ../dgit:6318
+#: ../dgit:6530
msgid "tree contains uncommitted files and --clean=check specified"
msgstr ""
"de boom bevat niet-vastgelegde bestanden en --clean=check werd opgegeven"
-#: ../dgit:6321
+#: ../dgit:6533
msgid "tree contains uncommitted files (NB dgit didn't run rules clean)"
msgstr ""
"de boom bevat niet-vastgelegde bestanden (NB dgit voerde geen rules clean "
"uit)"
-#: ../dgit:6324
+#: ../dgit:6536
msgid ""
"tree contains uncommited, untracked, unignored files\n"
"You can use --clean=git[-ff],always (-wga/-wgfa) to delete them."
@@ -1923,80 +1482,108 @@ msgstr ""
"de boom bevat niet-vastgelegde, niet-gevolgde, niet-genegeerde bestanden\n"
"U kunt --clean=git[-ff],always (-wga/-wgfa) gebruiken om ze te verwijderen."
-#: ../dgit:6342
+#: ../dgit:6549
+#, perl-format
+msgid ""
+"quilt mode %s (generally needs untracked upstream files)\n"
+"contradicts clean mode %s (which would delete them)\n"
+msgstr ""
+
+#: ../dgit:6566
msgid "tree contains uncommitted files (after running rules clean)"
msgstr ""
"de boom bevat niet-vastgelegde bestanden (na het uitvoeren van rules clean)"
-#: ../dgit:6356
+#: ../dgit:6580
msgid "clean takes no additional arguments"
msgstr "met clean kunnen geen extra argumenten opgegeven worden"
-#: ../dgit:6369
-#, perl-format
-msgid "-p is not allowed with dgit %s"
-msgstr "-p is niet toegestaan met dgit %s"
+#: ../dgit:6599
+#, fuzzy, perl-format
+#| msgid "-p specified %s but changelog specified %s"
+msgid "-p specified package %s, but changelog says %s"
+msgstr "-p gaf %s op, maar het changelog-bestand vermeldde %s"
-#: ../dgit:6408
+#: ../dgit:6609
+#, fuzzy
+#| msgid "dgit: --include-dirty is not supported in split view quilt mode"
+msgid ""
+"dgit: --include-dirty is not supported with split view (including with view-"
+"splitting quilt modes)"
+msgstr ""
+"dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste "
+"weergave"
+
+#: ../dgit:6618
+#, fuzzy, perl-format
+#| msgid "dgit: import-dsc: %s"
+msgid "dgit: --quilt=%s, %s"
+msgstr "dgit: import-dsc: %s"
+
+#: ../dgit:6622
+msgid "dgit: --upstream-commitish only makes sense with --quilt=baredebian"
+msgstr ""
+
+#: ../dgit:6657
#, perl-format
msgid "remove old changes file %s: %s"
msgstr "verwijder oud changes-bestand %s: %s"
-#: ../dgit:6410
+#: ../dgit:6659
#, perl-format
msgid "would remove %s"
msgstr "zou %s verwijderen"
-#: ../dgit:6436
+#: ../dgit:6685
msgid "archive query failed (queried because --since-version not specified)"
msgstr ""
"mislukt verzoek aan het archief (verzoek gedaan omdat --since-version niet "
"opgegeven werd)"
-#: ../dgit:6442
+#: ../dgit:6691
#, perl-format
msgid "changelog will contain changes since %s"
msgstr "changelog zal wijzigingen sinds %s bevatten"
-#: ../dgit:6445
+#: ../dgit:6694
msgid "package seems new, not specifying -v<version>"
msgstr "pakket lijkt nieuw te zijn, geen vermelding van -v<versie>"
-#: ../dgit:6488
+#: ../dgit:6737
msgid "Wanted to build nothing!"
msgstr "Wilde niets bouwen!"
-#: ../dgit:6526
+#: ../dgit:6775
#, perl-format
msgid "only one changes file from build (%s)\n"
msgstr "slechts één changes-bestand van bouw (%s)\n"
-#: ../dgit:6533
+#: ../dgit:6782
#, perl-format
msgid "%s found in binaries changes file %s"
msgstr "%s aangetroffen in changes-bestand %s van de binaire pakketten"
-#: ../dgit:6540
+#: ../dgit:6789
#, perl-format
msgid "%s unexpectedly not created by build"
msgstr "%s tegen de verwachtingen in niet gecreëerd door de bouw"
-#: ../dgit:6544
+#: ../dgit:6793
#, perl-format
msgid "install new changes %s{,.inmulti}: %s"
msgstr "installeer nieuw changes %s{,.inmulti}: %s"
-#: ../dgit:6549
+#: ../dgit:6798
#, perl-format
msgid "wrong number of different changes files (%s)"
msgstr "fout nummer van verschillende changes-bestanden (%s)"
-#: ../dgit:6552
+#: ../dgit:6801
#, perl-format
msgid "build successful, results in %s\n"
msgstr "bouw was succesvol, resultaten in %s\n"
-#: ../dgit:6565
+#: ../dgit:6814
#, perl-format
msgid ""
"changes files other than source matching %s already present; building would "
@@ -2008,11 +1595,11 @@ msgstr ""
"resultaat.\n"
"De suggestie is dat u %s verwijdert.\n"
-#: ../dgit:6583
+#: ../dgit:6832
msgid "build successful\n"
msgstr "de bouw was succesvol\n"
-#: ../dgit:6590
+#: ../dgit:6839
#, perl-format
msgid ""
"%s: warning: build-products-dir set, but not supported by dpkg-buildpackage\n"
@@ -2023,30 +1610,30 @@ msgstr ""
"%s: waarschuwing: build-products-dir zal genegeerd worden; bestanden zullen "
"gaan naar ..\n"
-#: ../dgit:6700
+#: ../dgit:6949
#, perl-format
msgid "remove %s: %s"
msgstr "verwijder %s: %s"
-#: ../dgit:6735
+#: ../dgit:6986
msgid "--include-dirty not supported with --build-products-dir, sorry"
msgstr "--include-dirty niet ondersteund met --build-products-dir, sorry"
-#: ../dgit:6755
+#: ../dgit:7006
#, perl-format
msgid "put in place new built file (%s): %s"
msgstr "zet nieuw gebouwd bestand (%s) op zijn plaats: %s"
-#: ../dgit:6768
+#: ../dgit:7019
msgid "build-source takes no additional arguments"
msgstr "build-source moet zonder bijkomende argumenten gebruikt worden"
-#: ../dgit:6772
+#: ../dgit:7023
#, perl-format
msgid "source built, results in %s and %s"
msgstr "broncodepakket is gebouwd, resultaten in %s en %s"
-#: ../dgit:6779
+#: ../dgit:7030
msgid ""
"dgit push-source: --include-dirty/--ignore-dirty does not makesense with "
"push-source!"
@@ -2054,21 +1641,21 @@ msgstr ""
"dgit push-source: --include-dirty/--ignore-dirty zijn zinloos met push-"
"source!"
-#: ../dgit:6785
+#: ../dgit:7036
msgid "source changes file"
msgstr "broncode-changes-bestand"
-#: ../dgit:6787
+#: ../dgit:7038
msgid "user-specified changes file is not source-only"
msgstr ""
"door de gebruiker opgegeven changes-bestand is niet 'uitsluitend broncode'"
-#: ../dgit:6807 ../dgit:6809
+#: ../dgit:7058 ../dgit:7060
#, perl-format
msgid "%s (in build products dir): %s"
msgstr "%s (in bouwproductenmap): %s"
-#: ../dgit:6822
+#: ../dgit:7073
msgid ""
"perhaps you need to pass -A ? (sbuild's default is to build only\n"
"arch-specific binaries; dgit 1.4 used to override that.)\n"
@@ -2077,7 +1664,7 @@ msgstr ""
"specifieke\n"
"binaire pakketten te bouwen; dgit 1.4 was gewend dit te overschrijven.)\n"
-#: ../dgit:6834
+#: ../dgit:7085
msgid ""
"you asked for a builder but your debbuildopts didn't ask for any binaries -- "
"is this really what you meant?"
@@ -2085,7 +1672,7 @@ msgstr ""
"u vroeg een bouwprogramma maar uw debbuildopts vroeg geen enkel binair "
"pakket - is dit echt wat u bedoelde?"
-#: ../dgit:6838
+#: ../dgit:7089
msgid ""
"we must build a .dsc to pass to the builder but your debbuiltopts forbids "
"the building of a source package; cannot continue"
@@ -2094,65 +1681,65 @@ msgstr ""
"debbuiltopts verbiedt het bouwen van een broncodepakket; voortgaan is "
"onmogelijk"
-#: ../dgit:6868
+#: ../dgit:7119
msgid "incorrect arguments to dgit print-unapplied-treeish"
msgstr "foutieve argumenten voor dgit print-unapplied-treeish"
-#: ../dgit:6890
+#: ../dgit:7140
msgid "source tree"
msgstr "broncodeboom"
-#: ../dgit:6892
+#: ../dgit:7142
#, perl-format
msgid "dgit: import-dsc: %s"
msgstr "dgit: import-dsc: %s"
-#: ../dgit:6905
+#: ../dgit:7155
#, perl-format
msgid "unknown dgit import-dsc sub-option `%s'"
msgstr "onbekende onderliggende optie `%s' voor dgit import-dsc"
-#: ../dgit:6909
+#: ../dgit:7159
msgid "usage: dgit import-dsc .../PATH/TO/.DSC BRANCH"
msgstr "gebruik: dgit import-dsc .../PAD/NAAR/.DSC TAK"
-#: ../dgit:6913
+#: ../dgit:7163
msgid "dry run makes no sense with import-dsc"
msgstr "testuitvoering (dry run) is zinloos met import-dsc"
-#: ../dgit:6930
+#: ../dgit:7180
#, perl-format
msgid "%s is checked out - will not update it"
msgstr "%s is binnengehaald (checked out) - zal het niet bijwerken"
-#: ../dgit:6935
+#: ../dgit:7185
#, perl-format
msgid "open import .dsc (%s): %s"
msgstr "open import-.dsc (%s): %s"
-#: ../dgit:6937
+#: ../dgit:7187
#, perl-format
msgid "read %s: %s"
msgstr "lees %s: %s"
-#: ../dgit:6948
+#: ../dgit:7198
msgid "import-dsc signature check failed"
msgstr "controle ondertekening van import-dsc mislukte"
-#: ../dgit:6951
+#: ../dgit:7201
#, perl-format
msgid "%s: warning: importing unsigned .dsc\n"
msgstr "%s: waarschuwing: niet-ondertekend .dsc wordt geïmporteerd\n"
-#: ../dgit:6962
+#: ../dgit:7212
msgid "Dgit metadata in .dsc"
msgstr "Dgit-metadata in .dsc"
-#: ../dgit:6973
+#: ../dgit:7223
msgid "dgit: import-dsc of .dsc with Dgit field, using git hash"
msgstr "dgit: import-dsc van .dsc met Dgit-veld, met behulp van git hash"
-#: ../dgit:6982
+#: ../dgit:7232
#, perl-format
msgid ""
".dsc contains Dgit field referring to object %s\n"
@@ -2163,21 +1750,21 @@ msgstr ""
"Uw git-boom bevat dat object niet. Gebruik `git fetch' van een aannemelijke\n"
"server (browse.dgit.d.o? salsa?) en probeer import-dsc opnieuw.\n"
-#: ../dgit:6989
+#: ../dgit:7239
msgid "Not fast forward, forced update."
msgstr "Niet lineair (fast forward), gedwongen update."
-#: ../dgit:6991
+#: ../dgit:7241
#, perl-format
msgid "Not fast forward to %s"
msgstr "Niet lineair (fast forward) naar %s"
-#: ../dgit:6996
+#: ../dgit:7246
#, perl-format
msgid "updated git ref %s"
msgstr "git ref %s geüpdatet"
-#: ../dgit:7001
+#: ../dgit:7251
#, perl-format
msgid ""
"Branch %s already exists\n"
@@ -2189,93 +1776,88 @@ msgstr ""
"geschiedenis\n"
"Geef +%s op om te overschrijven en bestaande geschiedenis te verwijderen\n"
-#: ../dgit:7021
+#: ../dgit:7271
#, perl-format
msgid "lstat %s works but stat gives %s !"
msgstr "lstat %s werkt maar stat geeft %s !"
-#: ../dgit:7023
+#: ../dgit:7273
#, perl-format
msgid "stat %s: %s"
msgstr "stat %s: %s"
-#: ../dgit:7031
+#: ../dgit:7281
#, perl-format
msgid "import %s requires %s, but: %s"
msgstr "importeren van %s vereist %s, maar: %s"
-#: ../dgit:7050
+#: ../dgit:7300
#, perl-format
msgid "cannot import %s which seems to be inside working tree!"
msgstr "kan %s niet importeren, het lijkt in de werkboom te zitten!"
-#: ../dgit:7054
+#: ../dgit:7304
#, perl-format
msgid "symlink %s to %s: %s"
msgstr "symbolische koppeling %s naar %s: %s"
-#: ../dgit:7055
+#: ../dgit:7305
#, perl-format
msgid "made symlink %s -> %s"
msgstr "maakte symbolische koppeling %s -> %s"
-#: ../dgit:7066
+#: ../dgit:7316
msgid "Import, forced update - synthetic orphan git history."
msgstr "Import, gedwongen update - kunstmatige verweesde git-geschiedenis."
-#: ../dgit:7068
+#: ../dgit:7318
msgid "Import, merging."
msgstr "Import, bezig met samenvoegen."
-#: ../dgit:7082
+#: ../dgit:7332
#, perl-format
msgid "Merge %s (%s) import into %s\n"
msgstr "Invoegen van import %s (%s) in %s\n"
-#: ../dgit:7091
+#: ../dgit:7341
#, perl-format
msgid "results are in git ref %s"
msgstr "resultaten staan in git ref %s"
-#: ../dgit:7098
+#: ../dgit:7348
msgid "need only 1 subpath argument"
msgstr "slechts 1 argument met een onderliggend pad nodig"
-#: ../dgit:7104
-#, perl-format
-msgid "exec curl: %s\n"
-msgstr "exec curl: %s\n"
-
-#: ../dgit:7118
+#: ../dgit:7366
msgid "need destination argument"
msgstr "bestemmingsargument nodig"
-#: ../dgit:7123
+#: ../dgit:7371
#, perl-format
msgid "exec git clone: %s\n"
msgstr "exec git clone: %s\n"
-#: ../dgit:7131
+#: ../dgit:7379
msgid "no arguments allowed to dgit print-dgit-repos-server-source-url"
msgstr "geen argumenten toegelaten bij dgit print-dgit-repos-server-source-url"
-#: ../dgit:7142
+#: ../dgit:7390
msgid "no arguments allowed to dgit print-dpkg-source-ignores"
msgstr "geen argumenten toegelaten bij dgit print-dpkg-source-ignores"
-#: ../dgit:7148
+#: ../dgit:7396
msgid "no arguments allowed to dgit setup-mergechangelogs"
msgstr "geen argumenten toegelaten bij dgit setup-mergechangelogs"
-#: ../dgit:7155 ../dgit:7161
+#: ../dgit:7403 ../dgit:7409
msgid "no arguments allowed to dgit setup-useremail"
msgstr "geen argumenten toegelaten bij dgit setup-useremail"
-#: ../dgit:7167
+#: ../dgit:7415
msgid "no arguments allowed to dgit setup-tree"
msgstr "geen argumenten toegelaten bij dgit setup-tree"
-#: ../dgit:7214
+#: ../dgit:7462
msgid ""
"--initiator-tempdir must be used specify an absolute, not relative, "
"directory."
@@ -2283,42 +1865,42 @@ msgstr ""
"--initiator-tempdir moet gebruikt worden om een absolute, geen relatieve map "
"op te geven."
-#: ../dgit:7253
+#: ../dgit:7501
#, perl-format
msgid "%s needs a value"
msgstr "%s moet een waarde hebben"
-#: ../dgit:7257
+#: ../dgit:7505
#, perl-format
msgid "bad value `%s' for %s"
msgstr "foute waarde `%s' voor %s"
-#: ../dgit:7348
+#: ../dgit:7605
#, perl-format
msgid "%s: warning: ignoring unknown force option %s\n"
msgstr "%s: waarschuwing: onbekende force-optie %s wordt genegeerd\n"
-#: ../dgit:7368
+#: ../dgit:7623
#, perl-format
msgid "unknown long option `%s'"
msgstr "onbekende lange optie `%s'"
-#: ../dgit:7423
+#: ../dgit:7678
#, perl-format
msgid "unknown short option `%s'"
msgstr "onbekende korte optie `%s'"
-#: ../dgit:7438
+#: ../dgit:7693
#, perl-format
msgid "%s is set to something other than SIG_DFL\n"
msgstr "%s staat ingesteld op iets anders dan SIG_DFL\n"
-#: ../dgit:7442
+#: ../dgit:7697
#, perl-format
msgid "%s is blocked\n"
msgstr "%s is geblokkeerd\n"
-#: ../dgit:7448
+#: ../dgit:7703
#, perl-format
msgid ""
"On entry to dgit, %s\n"
@@ -2329,53 +1911,42 @@ msgstr ""
"Dit is een bug die veroorzaakt wordt door iets in uw uitvoeringsomgeving.\n"
"Er wordt opgegeven.\n"
-#: ../dgit:7465
+#: ../dgit:7720
#, perl-format
msgid "cannot set command for %s"
msgstr "kan commando voor %s niet instellen"
-#: ../dgit:7478
+#: ../dgit:7733
#, perl-format
msgid "cannot configure options for %s"
msgstr "kan opties voor %s niet configureren"
-#: ../dgit:7498
+#: ../dgit:7753
#, perl-format
msgid "unknown quilt-mode `%s'"
msgstr "onbekende quilt-modus `%s'"
-#: ../dgit:7508
+#: ../dgit:7764
#, perl-format
msgid "unknown %s setting `%s'"
msgstr "onbekende %s dat `%s' instelt"
-#: ../dgit:7513
-msgid "dgit: --include-dirty is not supported in split view quilt mode"
-msgstr ""
-"dgit: --include-dirty wordt niet ondersteund in de quilt-modus gesplitste "
-"weergave"
-
-#: ../dgit:7524
-#, perl-format
-msgid "unknown clean-mode `%s'"
-msgstr "onbekende clean-modus `%s'"
-
-#: ../dgit:7545
+#: ../dgit:7792
msgid "DRY RUN ONLY\n"
msgstr "ENKEL TESTUITVOERING (DRY RUN)\n"
-#: ../dgit:7546
+#: ../dgit:7793
msgid "DAMP RUN - WILL MAKE LOCAL (UNSIGNED) CHANGES\n"
msgstr ""
"GETEMPERDE UITVOERING (DAMP RUN) - ZAL LOKALE (NIET-ONDERTEKENDE) "
"WIJZIGINGEN MAKEN\n"
-#: ../dgit:7565
+#: ../dgit:7812
#, perl-format
msgid "unknown operation %s"
msgstr "onbekende bewerking %s"
-#: ../git-debrebase:44
+#: ../git-debrebase:45
msgid ""
"usages:\n"
" git-debrebase [<options>] [--|-i <git rebase options...>]\n"
@@ -2397,50 +1968,50 @@ msgstr ""
" ...\n"
"Zie git-debrebase(1), git-debrebase(5), dgit-maint-debrebase(7) (in dgit).\n"
-#: ../git-debrebase:67
+#: ../git-debrebase:68
#, perl-format
msgid "%s: bad usage: %s\n"
msgstr "%s: foutief gebruik: %s\n"
-#: ../git-debrebase:78
+#: ../git-debrebase:79
#, perl-format
msgid "bad options follow `git-debrebase %s'"
msgstr "foutieve opties volgen na `git-debrebase %s'"
-#: ../git-debrebase:89
+#: ../git-debrebase:90
#, perl-format
msgid "missing required git config %s"
msgstr "de vereiste git-configuratie %s ontbreekt"
-#: ../git-debrebase:401
+#: ../git-debrebase:363
#, perl-format
msgid "%s: snag ignored (-f%s): %s\n"
msgstr "%s: moeilijkheid (snag) genegeerd (-f%s): %s\n"
-#: ../git-debrebase:404
+#: ../git-debrebase:366
#, perl-format
msgid "%s: snag detected (-f%s): %s\n"
msgstr "%s: moeilijkheid (snag) gevonden (-f%s): %s\n"
-#: ../git-debrebase:417
+#: ../git-debrebase:379
#, perl-format
msgid "%s: snags: %d overriden by individual -f options\n"
msgstr ""
"%s: moeilijkheden (snags): %d overschreven door individuele -f opties\n"
-#: ../git-debrebase:423
+#: ../git-debrebase:385
#, perl-format
msgid "%s: snags: %d overriden by global --force\n"
msgstr "%s: moeilijkheden (snags): %d overschreven door het globale --force\n"
-#: ../git-debrebase:427
+#: ../git-debrebase:389
#, perl-format
msgid "%s: snags: %d blocker(s) (you could -f<tag>, or --force)"
msgstr ""
"%s: moeilijkheden (snags): %d blokker(s) (u zou -f<tag> of --force kunnen "
"gebruiken)"
-#: ../git-debrebase:459
+#: ../git-debrebase:421
msgid ""
"Branch/history seems mangled - no longer in gdr format.\n"
"See ILLEGAL OPERATIONS in git-debrebase(5).\n"
@@ -2448,7 +2019,7 @@ msgstr ""
"Tak/geschiedenis lijkt verknoeid - niet langer in gdr-indeling.\n"
"Zie ILLEGAL OPERATIONS (ongeldige bewerkingen) in git-debrebase(5).\n"
-#: ../git-debrebase:466
+#: ../git-debrebase:428
#, perl-format
msgid ""
"%s\n"
@@ -2457,7 +2028,7 @@ msgstr ""
"%s\n"
"Zou dit een gdr-tak moeten zijn? %s\n"
-#: ../git-debrebase:471
+#: ../git-debrebase:433
#, perl-format
msgid ""
"%s\n"
@@ -2468,7 +2039,7 @@ msgstr ""
"%s\n"
"Overweeg git-debrebase scrap, om uw recent werk weg te gooien.\n"
-#: ../git-debrebase:477
+#: ../git-debrebase:439
#, perl-format
msgid ""
"%s\n"
@@ -2479,7 +2050,7 @@ msgstr ""
"Tak lijkt niet bedoeld te zijn als git-debrebase tak?\n"
"Foute tak, of misschien had u git-debrebase convert-from-* nodig.\n"
-#: ../git-debrebase:488
+#: ../git-debrebase:450
#, perl-format
msgid ""
"%s\n"
@@ -2491,260 +2062,254 @@ msgstr ""
"Misschien voerde u een reset naar of een rebase van een ongepaste plaats "
"uit.\n"
-#: ../git-debrebase:935
+#: ../git-debrebase:897
#, perl-format
msgid "git-debrebase `anchor' but %s"
msgstr "git-debrebase `anker' maar %s"
-#: ../git-debrebase:937
+#: ../git-debrebase:899
msgid "has other than two parents"
msgstr "heeft iets anders dan twee ouders"
-#: ../git-debrebase:938
+#: ../git-debrebase:900
msgid "contains debian/patches"
msgstr "bevat debian/patches"
-#: ../git-debrebase:964
+#: ../git-debrebase:926
msgid "is an origin commit"
msgstr "is een externe vastlegging (origin commit)"
-#: ../git-debrebase:966
+#: ../git-debrebase:928
msgid "upstream files differ from left parent"
msgstr "bestanden van de toeleveraar verschillen van de linkerouder"
-#: ../git-debrebase:968
+#: ../git-debrebase:930
msgid "debian/ differs from right parent"
msgstr "debian/ verschilt van de rechterouder"
-#: ../git-debrebase:979
+#: ../git-debrebase:941
msgid "edits debian/patches"
msgstr "bewerkt debian/patches"
-#: ../git-debrebase:991
+#: ../git-debrebase:953
msgid "parent's debian is not a directory"
msgstr "bij de ouder is debian geen map"
-#: ../git-debrebase:998
+#: ../git-debrebase:960
msgid "no changes"
msgstr "geen wijzigingen"
-#: ../git-debrebase:1004
+#: ../git-debrebase:966
msgid "origin commit"
msgstr "externe vastlegging (origin commit)"
-#: ../git-debrebase:1055
+#: ../git-debrebase:1017
#, perl-format
msgid "unknown kind of merge from %s"
msgstr "onbekend soort samenvoeging vanuit %s"
-#: ../git-debrebase:1058
+#: ../git-debrebase:1020
msgid "octopus merge"
msgstr "meervoudige samenvoeging (octopus merge)"
-#: ../git-debrebase:1062
+#: ../git-debrebase:1024
msgid "general two-parent merge"
msgstr "algemene twee-oudersamenvoeging (two-parent merge)"
-#: ../git-debrebase:1079
+#: ../git-debrebase:1041
#, perl-format
msgid "inconsistent anchors in merged-breakwaters %s"
msgstr "strijdige ankers in samengevoegde golfbrekers (merged-breakwaters) %s"
-#: ../git-debrebase:1119
+#: ../git-debrebase:1081
#, perl-format
msgid "branch needs laundering (run git-debrebase): %s"
msgstr "tak heeft wasbeurt (laundering) nodig (voer git-debrebase uit): %s"
-#: ../git-debrebase:1147
+#: ../git-debrebase:1109
#, perl-format
msgid "packaging change (%s) follows upstream change"
msgstr "wijziging (%s) bij het verpakken volgt de wijziging van de toeleveraar"
-#: ../git-debrebase:1148
+#: ../git-debrebase:1110
#, perl-format
msgid " (eg %s)"
msgstr " (bijv. %s)"
-#: ../git-debrebase:1154
+#: ../git-debrebase:1116
msgid "found mixed upstream/packaging commit"
msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen"
-#: ../git-debrebase:1155 ../git-debrebase:1163 ../git-debrebase:1168
-#: ../git-debrebase:1173 ../git-debrebase:1179 ../git-debrebase:1187
+#: ../git-debrebase:1117 ../git-debrebase:1125 ../git-debrebase:1130
+#: ../git-debrebase:1135 ../git-debrebase:1141 ../git-debrebase:1149
#, perl-format
msgid " (%s)"
msgstr " (%s)"
-#: ../git-debrebase:1162
+#: ../git-debrebase:1124
#, perl-format
msgid "found interchange bureaucracy commit (%s)"
msgstr "vastlegging in verband met uitwisselingsbeheer aangetroffen (%s)"
-#: ../git-debrebase:1167
+#: ../git-debrebase:1129
msgid "found dgit dsc import"
msgstr "dsc-import door dgit aangetroffen"
-#: ../git-debrebase:1172
+#: ../git-debrebase:1134
msgid "found bare dgit dsc import with no prior history"
msgstr ""
"kale dsc-import door dgit aangetroffen zonder voorafgaande geschiedenis"
-#: ../git-debrebase:1178
+#: ../git-debrebase:1140
msgid "found vanilla merge"
msgstr "standaardsamenvoeging (vanilla merge) aangetroffen"
-#: ../git-debrebase:1185
+#: ../git-debrebase:1147
#, perl-format
msgid "found unprocessable commit, cannot cope: %s"
msgstr "niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: %s"
-#: ../git-debrebase:1253
+#: ../git-debrebase:1215
#, perl-format
msgid "found unprocessable commit, cannot cope; %3$s: (commit %1$s) (d.%2$s)"
msgstr ""
"niet-verwerkbare vastlegging aangetroffen, kan er niet mee om; %3$s: "
"(vastlegging %1$s) (d.%2$s)"
-#: ../git-debrebase:1254
+#: ../git-debrebase:1216
#, perl-format
msgid "found unprocessable commit, cannot cope: (commit %1$s) (d.%2$s)"
msgstr ""
"niet-verwerkbare vastlegging aangetroffen, kan er niet mee om: (vastlegging "
"%1$s) (d.%2$s)"
-#: ../git-debrebase:1375
+#: ../git-debrebase:1337
msgid "bare dgit dsc import"
msgstr "kale dsc-import door dgit"
-#: ../git-debrebase:1715 ../git-debrebase:1718
+#: ../git-debrebase:1677 ../git-debrebase:1680
#, perl-format
msgid "mismatch %s ?"
msgstr "discrepantie %s ?"
-#: ../git-debrebase:1721
+#: ../git-debrebase:1683
#, perl-format
msgid "mismatch %s != %s ?"
msgstr "discrepantie %s != %s ?"
-#: ../git-debrebase:1731
+#: ../git-debrebase:1693
#, perl-format
msgid "internal error %#x %s %s"
msgstr "interne fout %#x %s %s"
-#: ../git-debrebase:1759
+#: ../git-debrebase:1721
#, perl-format
msgid "%s: laundered (head was %s)\n"
msgstr "%s: gewassen (laundered) (head was %s)\n"
-#: ../git-debrebase:1773
+#: ../git-debrebase:1735
msgid "you are in the middle of a git-rebase already"
msgstr "u bent reeds middenin een git-rebase"
-#: ../git-debrebase:1799
+#: ../git-debrebase:1761
msgid "launder for rebase"
msgstr "wassen (launder) voor rebase"
-#: ../git-debrebase:1804
+#: ../git-debrebase:1766
msgid "analyse does not support any options"
msgstr "analyse ondersteunt geen opties"
-#: ../git-debrebase:1806
+#: ../git-debrebase:1768
msgid "too many arguments to analyse"
msgstr "te veel argumenten om te analyseren"
-#: ../git-debrebase:1841
+#: ../git-debrebase:1801
+#, perl-format
+msgid "%s already exists"
+msgstr "%s bestaat reeds"
+
+#: ../git-debrebase:1803
msgid "HEAD symref is not to refs/heads/"
msgstr "HEAD symref wijst niet naar refs/heads/"
-#: ../git-debrebase:1864
+#: ../git-debrebase:1826
#, perl-format
msgid "OK, you are ahead of %s\n"
msgstr "Oké, u bent voor op %s\n"
-#: ../git-debrebase:1868
+#: ../git-debrebase:1830
#, perl-format
msgid "you are behind %s, divergence risk"
msgstr "u bent achter op %s, gevaar voor uiteenlopen"
-#: ../git-debrebase:1872
+#: ../git-debrebase:1834
#, perl-format
msgid "you have diverged from %s"
msgstr "u bent uiteengelopen van %s"
-#: ../git-debrebase:1894
+#: ../git-debrebase:1856
msgid "remote dgit branch"
msgstr "externe dgit-tak"
-#: ../git-debrebase:1897
+#: ../git-debrebase:1859
msgid "remote dgit branch for sid"
msgstr "externe dgit-tak voor sid"
-#: ../git-debrebase:1925
+#: ../git-debrebase:1887
msgid "Recorded previous head for preservation"
msgstr "Vorige head voor behoud opgetekend"
-#: ../git-debrebase:1933
+#: ../git-debrebase:1895
#, perl-format
msgid "could not record ffq-prev: %s"
msgstr "kon ffq-prev niet optekenen: %s"
-#: ../git-debrebase:1944
+#: ../git-debrebase:1906
#, perl-format
msgid "could not check ffq-prev: %s"
msgstr "kon ffq-prev niet controleren: %s"
-#: ../git-debrebase:1964
+#: ../git-debrebase:1926
msgid "fast forward"
msgstr "lineair (fast forward)"
-#: ../git-debrebase:1974
+#: ../git-debrebase:1936
msgid "Declare fast forward / record previous work"
msgstr "Afkondigen lineair (fast forward) / optekenen vorig werk"
-#: ../git-debrebase:1986
+#: ../git-debrebase:1948
msgid "No ffq-prev to stitch."
msgstr "Geen ffq-prev om te borduren."
-#: ../git-debrebase:2017
-#, perl-format
-msgid ""
-"Could not determine appropriate upstream commitish.\n"
-" (Tried these tags: %s)\n"
-" Check version, and specify upstream commitish explicitly."
-msgstr ""
-"Kon geen passende toeleveraar-commitish bepalen.\n"
-" (Probeerde deze tags: %s)\n"
-" Controleer versie en geef toeleveraar-commitish expliciet op."
-
-#: ../git-debrebase:2036
+#: ../git-debrebase:1965
msgid "need NEW-VERSION [UPS-COMMITTISH]"
msgstr "heb NIEUWE-VERSIE [TOEL-COMMITTISH] nodig"
-#: ../git-debrebase:2041
+#: ../git-debrebase:1970
#, perl-format
msgid "bad version number `%s'"
msgstr "fout versienummer `%s'"
-#: ../git-debrebase:2059
+#: ../git-debrebase:1988
#, perl-format
msgid "upstream piece `%s'"
msgstr "toeleveraarsstuk `%s'"
-#: ../git-debrebase:2060
+#: ../git-debrebase:1989
msgid "upstream (main piece"
msgstr "van de toeleveraar (belangrijkste stuk"
-#: ../git-debrebase:2080
+#: ../git-debrebase:2009
msgid "for each EXTRA-UPS-NAME need EXTRA-UPS-COMMITISH"
msgstr "voor elke EXTRA-TOEL-NAAM is een EXTRA-TOEL-COMMITISH nodig"
-#: ../git-debrebase:2098
+#: ../git-debrebase:2027
msgid "old anchor is recognised due to --anchor, cannot check upstream"
msgstr ""
"oud anker werd herkend omwille van --anchor, kan niet controleren bij "
"toeleveraar"
-#: ../git-debrebase:2114
+#: ../git-debrebase:2043
#, perl-format
msgid ""
"previous upstream combine %s mentions %d pieces (each implying one parent) "
@@ -2754,14 +2319,14 @@ msgstr ""
"(hetgeen voor elk ervan één ouder impliceert) maar heeft %d ouders (één per "
"stuk plus misschien een eerdere combinatie)"
-#: ../git-debrebase:2123
+#: ../git-debrebase:2052
#, perl-format
msgid "previous upstream combine %s first piece is not `.'"
msgstr ""
"eerste stuk van vorige toeleveraarscombinatie (upstream combine) %s is niet "
"`.'"
-#: ../git-debrebase:2136
+#: ../git-debrebase:2065
#, perl-format
msgid ""
"previous upstream %s is from git-debrebase but not an `upstream-combine' "
@@ -2770,118 +2335,118 @@ msgstr ""
"vorige toeleveraarsvastlegging %s is van git-debrebase maar geen `upstream-"
"combine'-vastlegging"
-#: ../git-debrebase:2147
+#: ../git-debrebase:2076
#, perl-format
msgid "introducing upstream piece `%s'"
msgstr "toeleveraarsstuk `%s' wordt ingevoerd"
-#: ../git-debrebase:2150
+#: ../git-debrebase:2079
#, perl-format
msgid "dropping upstream piece `%s'"
msgstr "toeleveraarsstuk `%s' wordt weggelaten"
-#: ../git-debrebase:2153
+#: ../git-debrebase:2082
#, perl-format
msgid "not fast forward: %s %s"
msgstr "niet lineair (fast forward): %s %s"
-#: ../git-debrebase:2264
+#: ../git-debrebase:2193
msgid "Previous head already recorded\n"
msgstr "Vorige head reeds opgenomen\n"
-#: ../git-debrebase:2268
+#: ../git-debrebase:2197
#, perl-format
msgid "Could not preserve: %s"
msgstr "Niet in staat te behouden: %s"
-#: ../git-debrebase:2273 ../git-debrebase:2279 ../git-debrebase:2285
-#: ../git-debrebase:2375 ../git-debrebase:2384 ../git-debrebase:2408
-#: ../git-debrebase:2472
+#: ../git-debrebase:2202 ../git-debrebase:2208 ../git-debrebase:2214
+#: ../git-debrebase:2304 ../git-debrebase:2313 ../git-debrebase:2337
+#: ../git-debrebase:2401
msgid "no arguments allowed"
msgstr "geen argumenten toegelaten"
-#: ../git-debrebase:2307
+#: ../git-debrebase:2236
msgid "branch contains furniture (not laundered)"
msgstr "tak bevat stoffering (niet gewassen)"
-#: ../git-debrebase:2308
+#: ../git-debrebase:2237
msgid "branch is unlaundered"
msgstr "tak is ongewassen (unlaundered)"
-#: ../git-debrebase:2309
+#: ../git-debrebase:2238
msgid "branch needs laundering"
msgstr "tak heeft wasbeurt nodig"
-#: ../git-debrebase:2310
+#: ../git-debrebase:2239
msgid "branch not in git-debrebase form"
msgstr "tak is niet in git-debrebase-indeling"
-#: ../git-debrebase:2320
+#: ../git-debrebase:2249
msgid "current branch contents, in git-debrebase terms:\n"
msgstr "inhoud van de huidige tak, in git-debrebase-terminologie:\n"
-#: ../git-debrebase:2322
+#: ../git-debrebase:2251
msgid " branch is laundered\n"
msgstr " tak is gewassen\n"
-#: ../git-debrebase:2338
+#: ../git-debrebase:2267
#, perl-format
msgid " %s is not well-defined\n"
msgstr " %s is niet goed gedefinieerd\n"
-#: ../git-debrebase:2344
+#: ../git-debrebase:2273
msgid "key git-debrebase commits:\n"
msgstr "kern-git-debrebase-vastleggingen:\n"
-#: ../git-debrebase:2345
+#: ../git-debrebase:2274
msgid "anchor"
msgstr "anker"
-#: ../git-debrebase:2346
+#: ../git-debrebase:2275
msgid "breakwater"
msgstr "golfbreker (breakwater)"
-#: ../git-debrebase:2351
+#: ../git-debrebase:2280
msgid "branch and ref status, in git-debrebase terms:\n"
msgstr "toestand van tak en ref, in git-debrebase-terminologie:\n"
-#: ../git-debrebase:2358
+#: ../git-debrebase:2287
msgid " unstitched; previous tip was:\n"
msgstr " borduursel losgemaakt; vorige tip was:\n"
-#: ../git-debrebase:2361
+#: ../git-debrebase:2290
msgid " stitched? (no record of git-debrebase work)\n"
msgstr " geborduurd? (geen registratie van git-debrebase-werk)\n"
-#: ../git-debrebase:2363
+#: ../git-debrebase:2292
msgid " stitched\n"
msgstr " geborduurd\n"
-#: ../git-debrebase:2365
+#: ../git-debrebase:2294
msgid " not git-debrebase (diverged since last stitch)\n"
msgstr " geen git-debrebase (uiteengelopen sinds laatste borduursel)\n"
-#: ../git-debrebase:2368
+#: ../git-debrebase:2297
msgid "you are currently rebasing\n"
msgstr "u bent momenteel aan het rebasen\n"
-#: ../git-debrebase:2385 ../git-debrebase:2398
+#: ../git-debrebase:2314 ../git-debrebase:2327
msgid "launder for git-debrebase quick"
msgstr "wassen voor git-debrebase quick"
-#: ../git-debrebase:2392 ../git-debrebase:2422
+#: ../git-debrebase:2321 ../git-debrebase:2351
msgid "No ongoing git-debrebase session."
msgstr "Geen lopende git-debrebase-sessie."
-#: ../git-debrebase:2461
+#: ../git-debrebase:2390
msgid "Commit patch queue (exported by git-debrebase)"
msgstr "Vastlegging patch-wachtrij (geëxporteerd door git-debrebase)"
-#: ../git-debrebase:2478
+#: ../git-debrebase:2407
msgid "No (more) patches to export."
msgstr "Geen (andere) patches die geëxporteerd moeten worden."
-#: ../git-debrebase:2485
+#: ../git-debrebase:2414
#, perl-format
msgid ""
"Patch export produced patch amendments (abandoned output commit %s). Try "
@@ -2890,39 +2455,39 @@ msgstr ""
"De patch-export produceerde patch-herzieningen (vastlegging van uitvoer %s "
"gestaakt). Probeer eerst een wasbeurt te doen."
-#: ../git-debrebase:2505
+#: ../git-debrebase:2434
#, perl-format
msgid "%s contains comments, which will be discarded"
msgstr "%s bevat commentaar die verwijderd zal worden"
-#: ../git-debrebase:2510
+#: ../git-debrebase:2439
#, perl-format
msgid "patch %s repeated in %s !"
msgstr "patch %s herhaald in %s !"
-#: ../git-debrebase:2517
+#: ../git-debrebase:2446
#, perl-format
msgid "Unused patch file %s will be discarded"
msgstr "Niet gebruikt patch-bestand %s zal verwijderd worden"
-#: ../git-debrebase:2525
+#: ../git-debrebase:2454
msgid "ffq-prev exists, this is already managed by git-debrebase!"
msgstr "ffq-prev bestaat; dit wordt reeds beheerd door git-debrebase!"
-#: ../git-debrebase:2530
+#: ../git-debrebase:2459
msgid "ahead of debrebase-last, this is already managed by git-debrebase!"
msgstr "voorop op debrebase-last; dit wordt reeds beheerd door git-debrebase!"
-#: ../git-debrebase:2546
+#: ../git-debrebase:2475
msgid "want only 1 optional argument, the upstream git commitish"
msgstr ""
"wil slechts 1 facultatief argument, de git commitish van de toeleveraar"
-#: ../git-debrebase:2551
+#: ../git-debrebase:2480
msgid "missing Version from changelog\n"
msgstr "Version vanuit de changelog wordt gemist\n"
-#: ../git-debrebase:2567
+#: ../git-debrebase:2496
#, perl-format
msgid ""
"upstream (%s) and HEAD are not\n"
@@ -2934,12 +2499,12 @@ msgstr ""
"commando uit:\n"
" git diff %s HEAD -- :!/debian :/\n"
-#: ../git-debrebase:2575
+#: ../git-debrebase:2504
#, perl-format
msgid "upstream (%s) is not an ancestor of HEAD"
msgstr "upstream (%s) is geen voorouder van HEAD"
-#: ../git-debrebase:2582
+#: ../git-debrebase:2511
#, perl-format
msgid ""
"history between upstream (%s) and HEAD contains direct changes to upstream "
@@ -2949,47 +2514,47 @@ msgstr ""
"aan toeleveraarsbestanden - bent u zeker dat dit een gbp-tak (patches-"
"unapplied)(geen toepassing van patches) is?"
-#: ../git-debrebase:2584
+#: ../git-debrebase:2513
#, perl-format
msgid "list expected changes with: %s\n"
msgstr "toon verwachte wijzigingen met: %s\n"
-#: ../git-debrebase:2591
+#: ../git-debrebase:2520
#, perl-format
msgid "upstream (%s) contains debian/ directory"
msgstr "upstream (%s) bevat een map debian/"
-#: ../git-debrebase:2609
+#: ../git-debrebase:2538
msgid "neither of the first two changelog entries are released\n"
msgstr ""
"geen van de eerste twee items uit het changelog-bestand werd uitgebracht\n"
-#: ../git-debrebase:2615
+#: ../git-debrebase:2544
#, perl-format
msgid "could not find suitable maintainer view tag %s\n"
msgstr "kon geen geschikte maintainer-weergavetag %s vinden\n"
-#: ../git-debrebase:2618
+#: ../git-debrebase:2547
#, perl-format
msgid "HEAD is not FF from maintainer tag %s!"
msgstr "HEAD is niet FF (lineair) vanaf maintainer-tag %s!"
-#: ../git-debrebase:2621
+#: ../git-debrebase:2550
#, perl-format
msgid "dgit view tag %s not found\n"
msgstr "dgit-weergavetag %s niet gevonden\n"
-#: ../git-debrebase:2623
+#: ../git-debrebase:2552
#, perl-format
msgid "dgit view tag %s is not FF from maintainer tag %s\n"
msgstr "dgit-weergavetag %s is niet FF (lineair) vanaf maintainer-tag %s\n"
-#: ../git-debrebase:2625
+#: ../git-debrebase:2554
#, perl-format
msgid "will stitch in dgit view, %s\n"
msgstr "zal borduren in de dgit-weergave, %s\n"
-#: ../git-debrebase:2632
+#: ../git-debrebase:2561
#, perl-format
msgid ""
"Cannot confirm dgit view: %s\n"
@@ -3000,14 +2565,14 @@ msgstr ""
"Borduren in dgit-weergave mislukte (zie bovenstaande berichten).\n"
"dgit --overwrite zal nodig zijn bij de eerste dgit push na de omzetting.\n"
-#: ../git-debrebase:2678
+#: ../git-debrebase:2607
#, perl-format
msgid "%s: converted from patched-unapplied (gbp) branch format, OK\n"
msgstr ""
"%s: omgezet vanuit de indeling van de tak zonder toepassing van patches "
"(patched-unapplied) (gbp), Oké\n"
-#: ../git-debrebase:2707
+#: ../git-debrebase:2636
#, perl-format
msgid ""
"%s: converted to git-buildpackage branch format\n"
@@ -3018,17 +2583,17 @@ msgstr ""
"%s: WAARSCHUWING: voer \"git-debrebase\" nu niet meer uit\n"
"%s: WAARSCHUWING: dat doen zou alle toeleveraarspatches doen wegvallen!\n"
-#: ../git-debrebase:2728
+#: ../git-debrebase:2657
msgid "takes 1 optional argument, the upstream commitish"
msgstr ""
"heeft 1 facultatief argument, de toeleveraar-commitish (upstream commitish)"
-#: ../git-debrebase:2736
+#: ../git-debrebase:2665
#, perl-format
msgid "%s, from command line"
msgstr "%s, van de commandoregel"
-#: ../git-debrebase:2750
+#: ../git-debrebase:2679
#, perl-format
msgid ""
"%s: Branch already seems to be in git-debrebase format!\n"
@@ -3039,58 +2604,58 @@ msgstr ""
"%s: --always-convert-anyway zou de omzettingsbewerking toch uitvoeren,\n"
"%s: maar is wellicht geen goed idee. Vermoedelijk wilde u niets doen.\n"
-#: ../git-debrebase:2754
+#: ../git-debrebase:2683
msgid "Branch already in git-debrebase format."
msgstr "Tak is reeds in git-debrebase-indeling."
-#: ../git-debrebase:2766
+#: ../git-debrebase:2695
msgid "Considering possible commits corresponding to upstream:\n"
msgstr ""
"Bezig vastleggingen na te gaan die mogelijk overeenkomen met die van de "
"toeleveraar:\n"
-#: ../git-debrebase:2773
+#: ../git-debrebase:2702
#, perl-format
msgid "git tag %s"
msgstr "git tag %s"
-#: ../git-debrebase:2779
+#: ../git-debrebase:2708
#, perl-format
msgid " git tag: no suitable tag found (tried %s)\n"
msgstr " git tag: geen geschikte tag gevonden (probeerde %s)\n"
-#: ../git-debrebase:2788
+#: ../git-debrebase:2717
#, perl-format
msgid "opendir build-products-dir %s: %s"
msgstr "opendir build-products-dir %s: %s"
-#: ../git-debrebase:2794
+#: ../git-debrebase:2723
#, perl-format
msgid " orig: found what looks like a .orig, %s\n"
msgstr " orig: iets wat op een .orig lijkt gevonden, %s\n"
-#: ../git-debrebase:2825
+#: ../git-debrebase:2754
#, perl-format
msgid " orig: no suitable origs found (looked for %s in %s)\n"
msgstr " orig: geen geschikte origs gevonden (gezocht naar %s in %s)\n"
-#: ../git-debrebase:2834
+#: ../git-debrebase:2763
msgid "Evaluating possible commits corresponding to upstream:\n"
msgstr ""
"Bezig vastleggingen te evalueren die mogelijk overeenkomen met die van de "
"toeleveraar:\n"
-#: ../git-debrebase:2871
+#: ../git-debrebase:2800
#, perl-format
msgid " %s: couldn't apply patches: gbp pq %s"
msgstr " %s: kon patches niet toepassen: gbp pq %s"
-#: ../git-debrebase:2880
+#: ../git-debrebase:2809
#, perl-format
msgid " %s: applying patches gives different tree\n"
msgstr " %s: patches toepassen geeft een afwijkende boom\n"
-#: ../git-debrebase:2894
+#: ../git-debrebase:2823
msgid ""
"Could not find or construct a suitable upstream commit.\n"
"Rerun adding --diagnose after convert-from-dgit-view, or pass a\n"
@@ -3101,99 +2666,99 @@ msgstr ""
"of geef expliciet een vastlegging van de toeleveraar op,\n"
"of bezorg geschikte origs.\n"
-#: ../git-debrebase:2900
+#: ../git-debrebase:2829
#, perl-format
msgid "Yes, will base new branch on %s\n"
msgstr "Ja, zal nieuwe tak baseren op %s\n"
-#: ../git-debrebase:2907
+#: ../git-debrebase:2836
msgid "forget-was-ever-debrebase takes no further arguments"
msgstr "forget-was-ever-debrebase wordt zonder verdere argumenten gebruikt"
-#: ../git-debrebase:2911
+#: ../git-debrebase:2840
#, perl-format
msgid "Not suitable for recording git-debrebaseness anyway: %s"
msgstr ""
"Hoe dan ook niet geschikt om de git-debrebase-toestand te registreren: %s"
-#: ../git-debrebase:3013
+#: ../git-debrebase:2942
msgid "bad options\n"
msgstr "foute opties\n"
-#: ../git-debrebase:3023
+#: ../git-debrebase:2952
#, perl-format
msgid "%s: no cuddling to -i for git-rebase"
msgstr "%s: niet gek van -i voor git-rebase"
-#: ../git-debrebase:3053
+#: ../git-debrebase:2982
#, perl-format
msgid "unknown git-debrebase sub-operation %s"
msgstr "onbekende onderliggende bewerking van git-debrebase: %s"
-#: ../Debian/Dgit.pm:295
+#: ../Debian/Dgit.pm:296
#, perl-format
msgid "error: %s\n"
msgstr "fout: %s\n"
-#: ../Debian/Dgit.pm:315
+#: ../Debian/Dgit.pm:322
#, perl-format
msgid "getcwd failed: %s\n"
msgstr "getcwd mislukte: %s\n"
-#: ../Debian/Dgit.pm:334
+#: ../Debian/Dgit.pm:341
msgid "terminated, reporting successful completion"
msgstr "beëindigd, met de melding van een succesvolle voltooiing"
-#: ../Debian/Dgit.pm:336
+#: ../Debian/Dgit.pm:343
#, perl-format
msgid "failed with error exit status %s"
msgstr "mislukt met de foutmelding %s"
-#: ../Debian/Dgit.pm:339
+#: ../Debian/Dgit.pm:346
#, perl-format
msgid "died due to fatal signal %s"
msgstr "gestorven vanwege fataal signaal %s"
-#: ../Debian/Dgit.pm:343
+#: ../Debian/Dgit.pm:350
#, perl-format
msgid "failed with unknown wait status %s"
msgstr "mislukt met ongekende wachttoestand %s"
-#: ../Debian/Dgit.pm:349
+#: ../Debian/Dgit.pm:356
msgid "failed command"
msgstr "mislukt commando"
-#: ../Debian/Dgit.pm:355
+#: ../Debian/Dgit.pm:362
#, perl-format
msgid "failed to fork/exec: %s"
msgstr "fork/exec is mislukt: %s"
-#: ../Debian/Dgit.pm:357
+#: ../Debian/Dgit.pm:364
#, perl-format
msgid "subprocess %s"
msgstr "onderliggend proces %s"
-#: ../Debian/Dgit.pm:359
+#: ../Debian/Dgit.pm:366
msgid "subprocess produced invalid output"
msgstr "onderliggend proces produceerde ongeldige uitvoer"
-#: ../Debian/Dgit.pm:450
+#: ../Debian/Dgit.pm:457
msgid "stat source file: %S"
msgstr "stat bronbestand: %S"
-#: ../Debian/Dgit.pm:460
+#: ../Debian/Dgit.pm:467
msgid "stat destination file: %S"
msgstr "stat doelbestand: %S"
-#: ../Debian/Dgit.pm:479
+#: ../Debian/Dgit.pm:486
msgid "finally install file after cp: %S"
msgstr "tot slot, installeer bestand na cp: %S"
-#: ../Debian/Dgit.pm:485
+#: ../Debian/Dgit.pm:492
msgid "delete old file after cp: %S"
msgstr "verwijder oud bestand na cp: %S"
-#: ../Debian/Dgit.pm:506
+#: ../Debian/Dgit.pm:513
msgid ""
"not in a git working tree?\n"
"(git rev-parse --show-toplevel produced no output)\n"
@@ -3201,33 +2766,55 @@ msgstr ""
"niet in een git werkboom?\n"
"(git rev-parse --show-toplevel gaf geen uitvoer)\n"
-#: ../Debian/Dgit.pm:509
+#: ../Debian/Dgit.pm:516
#, perl-format
msgid "chdir toplevel %s: %s\n"
msgstr "chdir naar hoogste niveau %s: %s\n"
-#: ../Debian/Dgit.pm:617
+#: ../Debian/Dgit.pm:624
msgid "git index contains changes (does not match HEAD)"
msgstr "de index van git bevat wijzigingen (komt niet overeen met HEAD)"
-#: ../Debian/Dgit.pm:618
+#: ../Debian/Dgit.pm:625
msgid "working tree is dirty (does not match HEAD)"
msgstr "werkboom is bevuild (komt niet overeen met HEAD)"
-#: ../Debian/Dgit.pm:689
+#: ../Debian/Dgit.pm:647
+#, fuzzy
+#| msgid "found mixed upstream/packaging commit"
+msgid "using specified upstream commitish"
+msgstr "gemengde toeleveraar/pakket-vastlegging aangetroffen"
+
+#: ../Debian/Dgit.pm:653
+#, perl-format
+msgid ""
+"Could not determine appropriate upstream commitish.\n"
+" (Tried these tags: %s)\n"
+" Check version, and specify upstream commitish explicitly."
+msgstr ""
+"Kon geen passende toeleveraar-commitish bepalen.\n"
+" (Probeerde deze tags: %s)\n"
+" Controleer versie en geef toeleveraar-commitish expliciet op."
+
+#: ../Debian/Dgit.pm:659 ../Debian/Dgit.pm:661
+#, perl-format
+msgid "using upstream from git tag %s"
+msgstr ""
+
+#: ../Debian/Dgit.pm:767
msgid "detached HEAD"
msgstr "vrijstaande HEAD (detached HEAD)"
-#: ../Debian/Dgit.pm:690
+#: ../Debian/Dgit.pm:768
msgid "HEAD symref is not to refs/"
msgstr "symbolische referentie HEAD is geen referentie naar refs/"
-#: ../Debian/Dgit.pm:706
+#: ../Debian/Dgit.pm:784
#, perl-format
msgid "parsing of %s failed"
msgstr "ontleden van %s mislukte"
-#: ../Debian/Dgit.pm:715
+#: ../Debian/Dgit.pm:793
#, perl-format
msgid ""
"control file %s is (already) PGP-signed. Note that dgit push needs to "
@@ -3236,44 +2823,436 @@ msgstr ""
"controlebestand %s heeft (reeds) een PGP-ondertekening. Merk op dat dgit "
"push het .dsc moet aanpassen en het dan zelf moet ondertekenen"
-#: ../Debian/Dgit.pm:729
+#: ../Debian/Dgit.pm:807
#, perl-format
msgid "open %s (%s): %s"
msgstr "open %s (%s): %s"
-#: ../Debian/Dgit.pm:750
+#: ../Debian/Dgit.pm:828
#, perl-format
msgid "missing field %s in %s"
msgstr "ontbrekend veld %s in %s"
-#: ../Debian/Dgit.pm:822
+#: ../Debian/Dgit.pm:914
msgid "Dummy commit - do not use\n"
msgstr "Voorbeeldvastlegging - niet gebruiken\n"
-#: ../Debian/Dgit.pm:843
+#: ../Debian/Dgit.pm:935
#, perl-format
msgid "exec %s: %s\n"
msgstr "exec %s: %s\n"
-#: ../Debian/Dgit.pm:911
+#: ../Debian/Dgit.pm:1003
#, perl-format
msgid "cannot stat %s/.git: %s"
msgstr "kan status van %s/.git niet verkrijgen: %s"
-#: ../Debian/Dgit.pm:934
+#: ../Debian/Dgit.pm:1026
#, perl-format
msgid "failed to mkdir playground parent %s: %s"
msgstr "mkdir van speelplaatsouder %s mislukte: %s"
-#: ../Debian/Dgit.pm:942
+#: ../Debian/Dgit.pm:1034
#, perl-format
msgid "failed to mkdir a playground %s: %s"
msgstr "mkdir van een speelplaats %s mislukte: %s"
-#: ../Debian/Dgit.pm:951
+#: ../Debian/Dgit.pm:1043
#, perl-format
msgid "failed to mkdir the playground %s: %s"
msgstr "mkdir van de speelplaats %s mislukte: %s"
+#~ msgid "failed to fetch %s: %s"
+#~ msgstr "ophalen (fetch) van %s mislukt: %s"
+
+#~ msgid ""
+#~ "config requested specific TLS key but do not know how to get curl to use "
+#~ "exactly that EE key (%s)"
+#~ msgstr ""
+#~ "de configuratie vereiste een specifieke TLS-sleutel, maar weet niet hoe "
+#~ "curl ertoe te brengen exact die EE-sleutel (%s) te gebruiken"
+
+#~ msgid "curl failed to print 3-digit HTTP code"
+#~ msgstr "curl slaagde niet in het weergeven van een 3-cijferige HTTP-code"
+
+#~ msgid "unexpected results from git check query - "
+#~ msgstr "het verzoek git check leverde onverwachte resultaten op - "
+
+#~ msgid "exec curl: %s\n"
+#~ msgstr "exec curl: %s\n"
+
+#~ msgid "Import %s"
+#~ msgstr "Importeren van %s"
+
+#~ msgid "Record %s (%s) in archive suite %s\n"
+#~ msgstr "Gegeven %s (%s) uit archiefsuite %s\n"
+
+#~ msgid "Not updating %s from %s to %s.\n"
+#~ msgstr "%s wordt niet opgewaardeerd van %s naar %s.\n"
+
+#~ msgid "%s: NO git hash"
+#~ msgstr "%s: GEEN hash van git"
+
+#~ msgid "%s: specified git info (%s)"
+#~ msgstr "%s: git info werd opgegeven (%s)"
+
+#~ msgid "%s: specified git hash"
+#~ msgstr "%s: git hash werd opgegeven"
+
+#~ msgid "%s: invalid Dgit info"
+#~ msgstr "%s: ongeldige Dgit info"
+
+#~ msgid "%s release %s for %s (%s) [dgit]\n"
+#~ msgstr "%s release %s voor %s (%s) [dgit]\n"
+
+#~ msgid ""
+#~ "%s release %s for %s (%s)\n"
+#~ "(maintainer view tag generated by dgit --quilt=%s)\n"
+#~ msgstr ""
+#~ "%s release %s voor %s (%s)\n"
+#~ "(tag 'maintainer view' gegenereerd door dgit --quilt=%s)\n"
+
+#~ msgid ""
+#~ "Push failed, while checking state of the archive.\n"
+#~ "You can retry the push, after fixing the problem, if you like.\n"
+#~ msgstr ""
+#~ "Push mislukte tijdens het nagaan van de toestand van het archief.\n"
+#~ "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het "
+#~ "probleem.\n"
+
+#~ msgid ""
+#~ "package appears to be new in this suite; if this is intentional, use --new"
+#~ msgstr ""
+#~ "het pakket lijkt in deze suite nieuw te zijn; als dit ook de bedoeling "
+#~ "is, gebruik dan --new"
+
+#~ msgid ""
+#~ "Push failed, while preparing your push.\n"
+#~ "You can retry the push, after fixing the problem, if you like.\n"
+#~ msgstr ""
+#~ "Push mislukte tijdens het voorbereiden van uw push.\n"
+#~ "Indien u wenst, kunt u de push opnieuw proberen, na het oplossen van het "
+#~ "probleem.\n"
+
+#~ msgid "looked for .dsc %s, but %s; maybe you forgot to build"
+#~ msgstr "zocht naar .dsc %s, maar %s; misschien vergat u te bouwen"
+
+#~ msgid ""
+#~ "Branch is managed by git-debrebase (%s\n"
+#~ "exists), but quilt mode (%s) implies a split view.\n"
+#~ "Pass the right --quilt option or adjust your git config.\n"
+#~ "Or, maybe, run git-debrebase forget-was-ever-debrebase.\n"
+#~ msgstr ""
+#~ "Tak wordt beheerd door git-debrebase (%s\n"
+#~ "bestaat), maar de quilt-modus (%s) impliceert een gesplitste weergave.\n"
+#~ "Gebruik de juiste --quilt-optie of pas uw git config aan.\n"
+#~ "Of voer misschien git-debrebase forget-was-ever-debrebase uit.\n"
+
+#~ msgid ""
+#~ "--quilt=%s but no cached dgit view:\n"
+#~ " perhaps HEAD changed since dgit build[-source] ?"
+#~ msgstr ""
+#~ "--quilt=%s maar geen gecachete dgit-weergave:\n"
+#~ " werd HEAD misschien gewijzigd sinds dgit build[-source]?"
+
+#~ msgid ""
+#~ "dgit push: HEAD is not a descendant of the archive's version.\n"
+#~ "To overwrite the archive's contents, pass --overwrite[=VERSION].\n"
+#~ "To rewind history, if permitted by the archive, use --deliberately-not-"
+#~ "fast-forward."
+#~ msgstr ""
+#~ "dgit push: HEAD is geen afstammeling van de versie van het archief.\n"
+#~ "Om de inhoud van het archief te overschrijven, geeft u de opdracht --"
+#~ "overwrite[=VERSIE].\n"
+#~ "Om de geschiedenis terug te spoelen, als het archief dat toestaat, "
+#~ "gebruikt u --deliberately-not-fast-forward."
+
+#~ msgid "checking that %s corresponds to HEAD"
+#~ msgstr "bezig na te gaan dat %s overeenkomt met HEAD"
+
+#~ msgid "HEAD specifies a different tree to %s:\n"
+#~ msgstr "HEAD geeft een andere boom op aan %s:\n"
+
+#~ msgid ""
+#~ "There is a problem with your source tree (see dgit(7) for some hints).\n"
+#~ "To see a full diff, run git diff %s %s\n"
+#~ msgstr ""
+#~ "Er is een probleem met uw broncodeboom (zie dgit(7) voor suggesties).\n"
+#~ "Om alle verschillen te zien, gebruikt u git diff %s %s\n"
+
+#~ msgid ""
+#~ "Perhaps you forgot to build. Or perhaps there is a problem with your\n"
+#~ " source tree (see dgit(7) for some hints). To see a full diff, run\n"
+#~ " git diff %s %s\n"
+#~ msgstr ""
+#~ "Misschien vergat u te bouwen (build). Of er is misschien een probleem "
+#~ "met\n"
+#~ " uw broncodeboom (zie dgit(7) voor suggesties). Om alle verschillen te "
+#~ "zien,\n"
+#~ " gebruikt u git diff %s %s\n"
+
+#~ msgid ""
+#~ "failed to find unique changes file (looked for %s in %s); perhaps you "
+#~ "need to use dgit -C"
+#~ msgstr ""
+#~ "kon geen uniek changes-bestand vinden (zocht naar %s in %s); misschien "
+#~ "moet u dgit -C gebruiken"
+
+#~ msgid "uploading binaries, although distro policy is source only"
+#~ msgstr ""
+#~ "bezig met uploaden van binaire pakketten, hoewel het beleid van de "
+#~ "distributie uitsluitend broncode (source only) voorschrijft"
+
+#~ msgid "source-only upload, although distro policy requires .debs"
+#~ msgstr ""
+#~ "upload van uitsluitend broncode (source-only), hoewel het beleid van de "
+#~ "distributie .deb's vereist"
+
+#~ msgid ""
+#~ "source-only upload, even though package is entirely NEW\n"
+#~ "(this is contrary to policy in %s)"
+#~ msgstr ""
+#~ "upload van uitsluitend broncode (source-only), hoewel pakket volledig "
+#~ "NIEUW is\n"
+#~ "(dit is in tegenspraak met de beleidsrichtlijnen in %s)"
+
+#~ msgid "unknown source-only-uploads policy `%s'"
+#~ msgstr "onbekende source-only-uploads beleidsrichtlijn `%s'"
+
+#~ msgid ""
+#~ "Push failed, while signing the tag.\n"
+#~ "You can retry the push, after fixing the problem, if you like.\n"
+#~ msgstr ""
+#~ "Push mislukte tijdens het ondertekenen van de tag.\n"
+#~ "Indien u dit wenst, kunt u de push opnieuw proberen na het oplossen van "
+#~ "het probleem.\n"
+
+#~ msgid ""
+#~ "Push failed, *after* signing the tag.\n"
+#~ "If you want to try again, you should use a new version number.\n"
+#~ msgstr ""
+#~ "Push mislukte *na* het ondertekenen van de tag.\n"
+#~ "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer "
+#~ "gebruiken.\n"
+
+#~ msgid ""
+#~ "Push failed, while updating the remote git repository - see messages "
+#~ "above.\n"
+#~ "If you want to try again, you should use a new version number.\n"
+#~ msgstr ""
+#~ "Push mislukte tijdens het bijwerken van de externe git-opslagplaats - zie "
+#~ "de meldingen hierboven.\n"
+#~ "Indien u opnieuw wenst te proberen, moet u een nieuw versienummer "
+#~ "gebruiken.\n"
+
+#~ msgid ""
+#~ "Push failed, while obtaining signatures on the .changes and .dsc.\n"
+#~ "If it was just that the signature failed, you may try again by using\n"
+#~ "debsign by hand to sign the changes file (see the command dgit tried,\n"
+#~ "above), and then dput that changes file to complete the upload.\n"
+#~ "If you need to change the package, you must use a new version number.\n"
+#~ msgstr ""
+#~ "Push mislukte bij het verkrijgen van de ondertekening van .changes en ."
+#~ "dsc.\n"
+#~ "Indien het louter een mislukte ondertekening betreft, kunt u opnieuw "
+#~ "proberen\n"
+#~ "door handmatig het changes-bestand te ondertekenen met debsign (zie "
+#~ "hierboven\n"
+#~ "welk commando dgit gebruikte) en vervolgens het changes-bestand te "
+#~ "uploaden\n"
+#~ "met dput om zo de upload te vervolledigen.\n"
+#~ "Indien u het pakket moet aanpassen, moet u een nieuw versienummer "
+#~ "gebruiken.\n"
+
+#~ msgid "pushed and uploaded %s"
+#~ msgstr "%s gepusht en geüpload"
+
+#~ msgid "-p is not allowed with clone; specify as argument instead"
+#~ msgstr ""
+#~ "-p mag niet met clone gebruikt worden; geef het in de plaats daarvan op "
+#~ "als argument"
+
+#~ msgid "incorrect arguments to dgit clone"
+#~ msgstr "incorrecte argumenten voor dgit clone"
+
+#~ msgid "remove %s: %s\n"
+#~ msgstr "verwijder %s: %s\n"
+
+#~ msgid "check whether to remove %s: %s\n"
+#~ msgstr "controleer of %s moet verwijderd worden: %s\n"
+
+#~ msgid "incorrect arguments to dgit fetch or dgit pull"
+#~ msgstr "incorrecte argumenten voor dgit fetch of dgit pull"
+
+#~ msgid "dgit pull not yet supported in split view mode (--quilt=%s)\n"
+#~ msgstr ""
+#~ "dgit pull wordt in gesplitste weergavemodus (--quilt=%s) nog niet "
+#~ "ondersteund\n"
+
+#~ msgid "dgit checkout needs a suite argument"
+#~ msgstr "dgit checkout heeft een suite nodig als argument"
+
+#~ msgid "setting up vcs-git: %s\n"
+#~ msgstr "bezig met opzetten van vcs-git: %s\n"
+
+#~ msgid "vcs git already configured: %s\n"
+#~ msgstr "vcs git is reeds geconfigureerd: %s\n"
+
+#~ msgid "changing vcs-git url to: %s\n"
+#~ msgstr "url van vcs-git wordt veranderd naar: %s\n"
+
+#~ msgid "fetching (%s)\n"
+#~ msgstr "bezig met ophalen (%s)\n"
+
+#~ msgid "incorrect arguments to dgit %s"
+#~ msgstr "incorrecte argumenten voor dgit %s"
+
+#~ msgid "dgit %s: changelog specifies %s (%s) but command line specifies %s"
+#~ msgstr ""
+#~ "dgit %s: het changelog-bestand vermeldt %s (%s), maar op de commandoregel "
+#~ "wordt %s opgegeven"
+
+#~ msgid ""
+#~ "build host has dgit rpush protocol versions %s but invocation host has %s"
+#~ msgstr ""
+#~ "de protocolversies van dgit rpush op de bouwcomputer zijn %s, maar die "
+#~ "van de aanroepende computer zijn %s"
+
+#~ msgid "create %s: %s"
+#~ msgstr "maak %s aan: %s"
+
+#~ msgid "build host child failed: %s"
+#~ msgstr "dochterproces op de bouwcomputer faalde: %s"
+
+#~ msgid "all done\n"
+#~ msgstr "alles klaar\n"
+
+#~ msgid "file %s (%s) twice"
+#~ msgstr "bestand %s (%s) tweemaal"
+
+#~ msgid "bad param spec"
+#~ msgstr "slechte parameter-spec"
+
+#~ msgid "bad previously spec"
+#~ msgstr "slechte vroegere spec"
+
+#~ msgid ""
+#~ "rpush negotiated protocol version %s which does not support quilt mode %s"
+#~ msgstr ""
+#~ "de onderhandeling van rpush leverde protocolversie %s op, welke quilt-"
+#~ "modus %s niet ondersteunt"
+
+#~ msgid "buildinfo mismatch in field %s"
+#~ msgstr "buildinfo-incongruentie in veld %s"
+
+#~ msgid "buildinfo contains forbidden field %s"
+#~ msgstr "buildinfo bevat ongeoorloofd veld %s"
+
+#~ msgid "remote changes file"
+#~ msgstr "extern changes-bestand"
+
+#~ msgid "not a plain file or symlink\n"
+#~ msgstr "geen echt bestand of symbolische koppeling\n"
+
+#~ msgid "mode or type changed\n"
+#~ msgstr "modus of type gewijzigd\n"
+
+#~ msgid "modified symlink\n"
+#~ msgstr "symbolische koppeling gewijzigd\n"
+
+#~ msgid "deletion of symlink\n"
+#~ msgstr "verwijdering van symbolische koppeling\n"
+
+#~ msgid "creation with non-default mode\n"
+#~ msgstr "creatie met een niet-standaard modus\n"
+
+#~ msgid "dgit view: changes are required..."
+#~ msgstr "dgit-weergave: er zijn wijzigingen vereist..."
+
+#~ msgid ""
+#~ "\n"
+#~ "For full diff showing the problem(s), type:\n"
+#~ " %s\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Voor een volledige diff die het/de probl(e)em(en) laat zien, typt u:\n"
+#~ " %s\n"
+
+#~ msgid ""
+#~ "--quilt=%s specified, implying patches-unapplied git tree\n"
+#~ " but git tree differs from orig in upstream files."
+#~ msgstr ""
+#~ "--quilt=%s opgegeven, hetgeen een patches-unapplied git tree impliceert\n"
+#~ " (een git-boom zonder dat de patches toegepast worden)\n"
+#~ " maar de git-boom verschilt van orig in de toeleveraarsbestanden."
+
+#~ msgid ""
+#~ "\n"
+#~ " ... debian/patches is missing; perhaps this is a patch queue branch?"
+#~ msgstr ""
+#~ "\n"
+#~ " ... debian/patches ontbreekt; is dit misschien een tak met een patch-"
+#~ "wachtrij?"
+
+#~ msgid ""
+#~ "--quilt=%s specified, implying patches-applied git tree\n"
+#~ " but git tree differs from result of applying debian/patches to upstream\n"
+#~ msgstr ""
+#~ "--quilt=%s opgegeven, hetgeen een patches-applied git tree impliceert\n"
+#~ " (een git-boom met toegepaste patches)\n"
+#~ " maar de git-boom verschilt van het resultaat van het toepassen van\n"
+#~ " debian/patches op de broncode van de toeleveraar.\n"
+
+#~ msgid "dgit view: creating patches-applied version using gbp pq"
+#~ msgstr ""
+#~ "dgit-weergave: met gbp pq wordt een versie met toegepaste patches gemaakt"
+
+#~ msgid ""
+#~ "--quilt=%s specified, implying that HEAD is for use with a\n"
+#~ " tool which does not create patches for changes to upstream\n"
+#~ " .gitignores: but, such patches exist in debian/patches.\n"
+#~ msgstr ""
+#~ "--quilt=%s werd opgegeven, hetgeen inhoudt dat HEAD bedoeld is om "
+#~ "gebruikt\n"
+#~ " te worden met een hulpmiddel dat geen patches maakt om .gitignores van "
+#~ "de\n"
+#~ " toeleveraar te wijzigen: maar debian/patches heeft wel dergelijke "
+#~ "patches.\n"
+
+#~ msgid "dgit view: creating patch to represent .gitignore changes"
+#~ msgstr ""
+#~ "dgit-weergave: een patch wordt gemaakt om de wijzigingen aan .gitignore "
+#~ "te representeren"
+
+#~ msgid ""
+#~ "%s already exists; but want to create it to record .gitignore changes"
+#~ msgstr ""
+#~ "%s bestaat reeds; maar wil het aanmaken om de wijzigingen aan .gitignore "
+#~ "op te tekenen"
+
+#~ msgid ""
+#~ "Subject: Update .gitignore from Debian packaging branch\n"
+#~ "\n"
+#~ "The Debian packaging git branch contains these updates to the upstream\n"
+#~ ".gitignore file(s). This patch is autogenerated, to provide these\n"
+#~ "updates to users of the official Debian archive view of the package.\n"
+#~ msgstr ""
+#~ "Onderwerp: Bijwerken van .gitignore vanuit de Debian pakketbouw-tak\n"
+#~ "\n"
+#~ "De git-tak met het Debian pakket bevat deze bijwerkingen aan het/de\n"
+#~ ".gitignore-bestand(en) van de toeleveraar. Deze patch werd automatisch\n"
+#~ "gegenereerd om deze updates ter beschikking te stellen van gebruikers "
+#~ "van\n"
+#~ "de weergave van het pakket uit het officiële Debian-archief.\n"
+
+#~ msgid "Commit patch to update .gitignore\n"
+#~ msgstr "Commit (vastleggen) van patch om .gitignore bij te werken\n"
+
+#~ msgid "-p is not allowed with dgit %s"
+#~ msgstr "-p is niet toegestaan met dgit %s"
+
+#~ msgid "unknown clean-mode `%s'"
+#~ msgstr "onbekende clean-modus `%s'"
+
#~ msgid "import %s requires .../%s, but it does not exist"
#~ msgstr "importeren van %s vereist .../%s, maar dit bestaat niet"
diff --git a/po4a/dgit-maint-debrebase_7.pot b/po4a/dgit-maint-debrebase_7.pot
index 71969f4..3c25348 100644
--- a/po4a/dgit-maint-debrebase_7.pot
+++ b/po4a/dgit-maint-debrebase_7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
@@ -21,18 +21,20 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../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:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
+#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -41,7 +43,7 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
@@ -66,9 +68,9 @@ msgid ""
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335
-#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67
-#: ../dgit-maint-debrebase.7.pod:326
+#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361
+#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67
+#: ../dgit-maint-debrebase.7.pod:352
msgid "When upstream tags releases in git"
msgstr ""
@@ -106,8 +108,8 @@ msgid "Finally, you need an orig tarball:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402
-#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:388
+#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432
+#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419
#, no-wrap
msgid ""
" % git deborig\n"
@@ -127,14 +129,51 @@ msgid ""
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343
-#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137
-#: ../dgit-maint-debrebase.7.pod:334
+#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137
+msgid "Using untagged upstream commits"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141
+msgid ""
+"Sometimes upstream does not tag their releases, or you want to package an "
+"unreleased git snapshot. In such a case you can create your own upstream "
+"release tag, of the form B<upstream/>I<ver>, where I<ver> is the upstream "
+"version you plan to put in I<debian/changelog>. The B<upstream/> prefix "
+"ensures that your tag will not clash with any tags upstream later creates."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148
+msgid ""
+"For example, suppose that the latest upstream release is 1.2.2 and you want "
+"to package git commit ab34c21 which was made on 2013-12-11. A common "
+"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 "
+"and so you could use"
+msgstr ""
+
+#. type: verbatim
+#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155
+#, no-wrap
+msgid ""
+" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159
+msgid "to obtain a release tag, and then proceed as above."
+msgstr ""
+
+#. type: =head3
+#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373
+#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163
+#: ../dgit-maint-debrebase.7.pod:364
msgid "When upstream releases only tarballs"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145
+#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171
#, no-wrap
msgid ""
" % mkdir foo\n"
@@ -144,12 +183,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151
+#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177
msgid "Now create I<debian/gbp.conf>:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155
+#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
#, no-wrap
msgid ""
" [DEFAULT]\n"
@@ -160,7 +199,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160
+#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186
#, no-wrap
msgid ""
" sign-tags = True\n"
@@ -170,7 +209,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164
+#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190
#, no-wrap
msgid ""
" [import-orig]\n"
@@ -179,12 +218,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169
+#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
msgid "gbp-import-orig(1) requires a pre-existing upstream branch:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173
+#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199
#, no-wrap
msgid ""
" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n"
@@ -196,12 +235,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
+#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207
msgid "Then we can import the upstream version:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185
+#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211
#, no-wrap
msgid ""
" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n"
@@ -209,7 +248,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189
+#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215
msgid ""
"Our upstream branch cannot be pushed to B<dgit-repos>, but since we will "
"need it whenever we import a new upstream version, we must push it "
@@ -217,7 +256,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
+#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221
#, no-wrap
msgid ""
" % git remote add -f origin salsa.debian.org:Debian/foo.git\n"
@@ -226,19 +265,19 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207
+#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233
msgid "CONVERTING AN EXISTING PACKAGE"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209
+#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235
msgid ""
"This section explains how to convert an existing Debian package to this "
"workflow. It should be skipped when debianising a new package."
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240
+#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266
#, no-wrap
msgid ""
" % git remote add -f upstream https://some.upstream/foo.git\n"
@@ -246,24 +285,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:294
+#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320
msgid ""
"To achieve this, you might need to delete I<debian/source/local-options>. "
"One way to have dgit check your progress is to run B<dgit build-source>."
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:441
+#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472
msgid "BUILDING AND UPLOADING"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:324
+#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350
msgid "Obtaining the release"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:330
+#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
" % git remote update\n"
@@ -271,7 +310,15 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:336
+#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360
+msgid ""
+"If you want to package an untagged upstream commit (because upstream does "
+"not tag releases or because you want to package an upstream development "
+"snapshot), see \"Using untagged upstream commits\" above."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366
msgid ""
"You will need the I<debian/gbp.conf> from \"When upstream releases only "
"tarballs\", above. You will also need your upstream branch. Above, we "
@@ -280,12 +327,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:341
+#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371
msgid "Then, either"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:345
+#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375
#, no-wrap
msgid ""
" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n"
@@ -293,12 +340,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:349
+#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379
msgid "or if you have a working watch file"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:353
+#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383
#, no-wrap
msgid ""
" % gbp import-orig --no-merge --uscan\n"
@@ -306,7 +353,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:382
+#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413
msgid ""
"If you obtained a tarball from upstream, you are ready to try a build. If "
"you merged a git tag from upstream, you will first need to generate a "
@@ -314,12 +361,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:472
+#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503
msgid "HANDLING DFSG-NON-FREE MATERIAL"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:546
+#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577
msgid ""
"The easiest way to handle this is to add a B<Files-Excluded> field to "
"I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. "
@@ -328,19 +375,20 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130
-#: ../dgit-maint-debrebase.7.pod:551
+#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130
+#: ../dgit-maint-debrebase.7.pod:582
msgid "INCORPORATING NMUS"
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140
-#: ../dgit-maint-debrebase.7.pod:751
+#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
+#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
+#: ../git-debpush.1.pod:228
msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:753
+#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784
msgid ""
"This tutorial was written and is maintained by Sean Whitton "
"<spwhitton@spwhitton.name>. It contains contributions from other dgit "
@@ -348,7 +396,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:298
+#: ../dgit-maint-gbp.7.pod:32 ../dgit-maint-debrebase.7.pod:324
msgid "GIT CONFIGURATION"
msgstr ""
@@ -481,14 +529,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:139
+#: ../dgit-maint-debrebase.7.pod:165
msgid ""
"Because we want to work in git, we need a virtual upstream branch with "
"virtual release tags. gbp-import-orig(1) can manage this for us. To begin"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:200
+#: ../dgit-maint-debrebase.7.pod:226
msgid ""
"You are now ready to proceed as above, making commits to the I<debian/> "
"directory and to the upstream source. As above, for technical reasons, B<it "
@@ -498,7 +546,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:212
+#: ../dgit-maint-debrebase.7.pod:238
msgid ""
"If you have an existing git history that you have pushed to an ordinary git "
"server like B<salsa.debian.org>, we start with that. If you don't already "
@@ -507,7 +555,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:219
+#: ../dgit-maint-debrebase.7.pod:245
#, no-wrap
msgid ""
" % git clone salsa.debian.org:Debian/foo\n"
@@ -518,14 +566,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:226
+#: ../dgit-maint-debrebase.7.pod:252
msgid ""
"If you don't have any existing git history, or you have history only on the "
"special B<dgit-repos> server, we start with B<dgit clone>:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:231
+#: ../dgit-maint-debrebase.7.pod:257
#, no-wrap
msgid ""
" % dgit clone foo\n"
@@ -534,12 +582,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:236
+#: ../dgit-maint-debrebase.7.pod:262
msgid "Then we make new upstream tags available:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:244
+#: ../dgit-maint-debrebase.7.pod:270
msgid ""
"We now use a B<git debrebase convert-from-*> command to convert your "
"existing history to the git-debrebase(5) data model. Which command you "
@@ -547,17 +595,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:250
+#: ../dgit-maint-debrebase.7.pod:276
msgid "(A) There is no delta queue."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:252
+#: ../dgit-maint-debrebase.7.pod:278
msgid "If there do not exist any Debian patches, use"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:256 ../dgit-maint-debrebase.7.pod:268
+#: ../dgit-maint-debrebase.7.pod:282 ../dgit-maint-debrebase.7.pod:294
#, no-wrap
msgid ""
" % git debrebase convert-from-gbp\n"
@@ -565,12 +613,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:260
+#: ../dgit-maint-debrebase.7.pod:286
msgid "(B) There is a delta queue, and patches are unapplied."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:262
+#: ../dgit-maint-debrebase.7.pod:288
msgid ""
"This is the standard git-buildpackage(1) workflow: there are Debian patches, "
"but the upstream source is committed to git without those patches applied. "
@@ -578,7 +626,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:272
+#: ../dgit-maint-debrebase.7.pod:298
msgid ""
"If you were not previously using dgit to upload your package (i.e. you were "
"not using the workflow described in dgit-maint-gbp(7)), and you happen to "
@@ -587,17 +635,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../dgit-maint-debrebase.7.pod:277
+#: ../dgit-maint-debrebase.7.pod:303
msgid "(C) There is a delta queue, and patches are applied."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:279
+#: ../dgit-maint-debrebase.7.pod:305
msgid "Use"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:283
+#: ../dgit-maint-debrebase.7.pod:309
#, no-wrap
msgid ""
" % git debrebase convert-from-dgit-view\n"
@@ -605,7 +653,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:289
+#: ../dgit-maint-debrebase.7.pod:315
msgid ""
"Finally, you need to ensure that your git HEAD is dgit-compatible, i.e., it "
"is exactly what you would get if you deleted .git, invoked B<dpkg-"
@@ -613,7 +661,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:300
+#: ../dgit-maint-debrebase.7.pod:326
msgid ""
"git-debrebase(1) does not yet support using B<git merge> to merge divergent "
"branches of development (see \"OTHER MERGES\" in git-debrebase(5)). You "
@@ -621,7 +669,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:307
+#: ../dgit-maint-debrebase.7.pod:333
#, no-wrap
msgid ""
" % git config --local pull.rebase true\n"
@@ -629,14 +677,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:311
+#: ../dgit-maint-debrebase.7.pod:337
msgid ""
"Now when you pull work from other Debian contributors, git will rebase your "
"work on top of theirs."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:314
+#: ../dgit-maint-debrebase.7.pod:340
msgid ""
"If you use this clone for upstream development in addition to Debian "
"packaging work, you may not want to set this global setting. Instead, see "
@@ -645,24 +693,24 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:319
+#: ../dgit-maint-debrebase.7.pod:345
msgid "IMPORTING NEW UPSTREAM RELEASES"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:321
+#: ../dgit-maint-debrebase.7.pod:347
msgid ""
"There are two steps: obtaining git refs that correspond to the new release, "
"and importing that release using git-debrebase(1)."
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:357
+#: ../dgit-maint-debrebase.7.pod:387
msgid "Importing the release"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:361
+#: ../dgit-maint-debrebase.7.pod:391
#, no-wrap
msgid ""
" % git debrebase new-upstream 1.2.3\n"
@@ -670,7 +718,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:365
+#: ../dgit-maint-debrebase.7.pod:395
msgid ""
"This invocation of git-debrebase(1) involves a git rebase. You may need to "
"resolve conflicts if the Debian delta queue does not apply cleanly to the "
@@ -678,13 +726,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:369
+#: ../dgit-maint-debrebase.7.pod:399
msgid ""
"If all went well, you can now review the merge of the new upstream release:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:374
+#: ../dgit-maint-debrebase.7.pod:404
#, no-wrap
msgid ""
" git diff debian/1.2.2-1..HEAD -- . ':!debian'\n"
@@ -692,35 +740,36 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:378
+#: ../dgit-maint-debrebase.7.pod:408
msgid ""
-"Pass I<--stat> just to see the list of changed files, which is useful to "
-"determine whether there are any new or deleted files that may need "
-"accounting for in your copyright file."
+"Also, diff with I<--name-status> and I<--diff-filter=ADR> to see just the "
+"list of added or removed files, which is useful to determine whether there "
+"are any new or deleted files that may need accounting for in your copyright "
+"file."
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:392
+#: ../dgit-maint-debrebase.7.pod:423
msgid "EDITING THE DEBIAN PACKAGING"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:394
+#: ../dgit-maint-debrebase.7.pod:425
msgid "Just make commits on master that change the contents of I<debian/>."
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:396
+#: ../dgit-maint-debrebase.7.pod:427
msgid "EDITING THE DELTA QUEUE"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:398
+#: ../dgit-maint-debrebase.7.pod:429
msgid "Adding new patches"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:400
+#: ../dgit-maint-debrebase.7.pod:431
msgid ""
"Adding new patches is straightforward: just make commits touching only files "
"outside of the I<debian/> directory. You can also use tools like git-"
@@ -728,19 +777,19 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:404
+#: ../dgit-maint-debrebase.7.pod:435
msgid "Editing patches: starting a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:406
+#: ../dgit-maint-debrebase.7.pod:437
msgid ""
"git-debrebase(1) is a wrapper around git-rebase(1) which allows us to edit, "
"re-order and delete patches. Run"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:411 ../dgit-maint-debrebase.7.pod:714
+#: ../dgit-maint-debrebase.7.pod:442 ../dgit-maint-debrebase.7.pod:745
#, no-wrap
msgid ""
" % git debrebase -i\n"
@@ -748,19 +797,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:415
+#: ../dgit-maint-debrebase.7.pod:446
msgid ""
"to start an interactive rebase. You can edit, re-order and delete commits "
"just as you would during B<git rebase -i>."
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:418
+#: ../dgit-maint-debrebase.7.pod:449
msgid "Editing patches: finishing a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:420
+#: ../dgit-maint-debrebase.7.pod:451
msgid ""
"After completing the git rebase, your branch will not be a fast-forward of "
"the git HEAD you had before the rebase. This means that we cannot push the "
@@ -769,14 +818,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:426
+#: ../dgit-maint-debrebase.7.pod:457
msgid ""
"If you are not yet ready to upload, and want to push your branch to a git "
"remote such as B<salsa.debian.org>,"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:431
+#: ../dgit-maint-debrebase.7.pod:462
#, no-wrap
msgid ""
" % git debrebase conclude\n"
@@ -784,7 +833,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:435
+#: ../dgit-maint-debrebase.7.pod:466
msgid ""
"Note that each time you conclude a debrebase you introduce a pseudomerge "
"into your git history, which may make it harder to read. Try to do all of "
@@ -794,7 +843,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:443
+#: ../dgit-maint-debrebase.7.pod:474
msgid ""
"You can use dpkg-buildpackage(1) for test builds. When you are ready to "
"build for an upload, use B<dgit sbuild>, B<dgit pbuilder> or B<dgit "
@@ -802,14 +851,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:447
+#: ../dgit-maint-debrebase.7.pod:478
msgid ""
"Upload with B<dgit push> or B<dgit push-source>. Remember to pass I<--new> "
"if the package is new in the target suite."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:450
+#: ../dgit-maint-debrebase.7.pod:481
msgid ""
"In some cases where you used B<git debrebase convert-from-gbp> since the "
"last upload, it is not possible for dgit to make your history fast-"
@@ -819,7 +868,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:456
+#: ../dgit-maint-debrebase.7.pod:487
msgid ""
"Right before uploading, if you did not just already do so, you might want to "
"have git-debrebase(1) shuffle your branch such that the Debian delta queue "
@@ -827,7 +876,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:462
+#: ../dgit-maint-debrebase.7.pod:493
#, no-wrap
msgid ""
" % git debrebase\n"
@@ -836,24 +885,24 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:467
+#: ../dgit-maint-debrebase.7.pod:498
msgid "Note that this will introduce a new pseudomerge."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:469
+#: ../dgit-maint-debrebase.7.pod:500
msgid ""
"After dgit pushing, be sure to git push to B<salsa.debian.org>, if you're "
"using that."
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:474
+#: ../dgit-maint-debrebase.7.pod:505
msgid "Illegal material"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:476
+#: ../dgit-maint-debrebase.7.pod:507
msgid ""
"Here we explain how to handle material that is merely DFSG-non-free. "
"Material which is legally dangerous (for example, files which are actually "
@@ -861,7 +910,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:480
+#: ../dgit-maint-debrebase.7.pod:511
#, no-wrap
msgid ""
"If you encounter possibly-legally-dangerous material in the upstream\n"
@@ -873,12 +922,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:486
+#: ../dgit-maint-debrebase.7.pod:517
msgid "DFSG-non-free: When upstream tags releases in git"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:488
+#: ../dgit-maint-debrebase.7.pod:519
msgid ""
"Our approach is to maintain a DFSG-clean upstream branch, and create tags on "
"this branch for each release that we want to import. We then import those "
@@ -887,12 +936,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:494
+#: ../dgit-maint-debrebase.7.pod:525
msgid "For the first upstream release that requires DFSG filtering:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:498
+#: ../dgit-maint-debrebase.7.pod:529
#, no-wrap
msgid ""
" % git checkout -b upstream-dfsg 1.2.3\n"
@@ -904,14 +953,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:506
+#: ../dgit-maint-debrebase.7.pod:537
msgid ""
"Now either proceed with \"Importing the release\" on the 1.2.3+dfsg tag, or "
"in the case of a new package,"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:511
+#: ../dgit-maint-debrebase.7.pod:542
#, no-wrap
msgid ""
" % git branch --unset-upstream\n"
@@ -920,18 +969,18 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:516
+#: ../dgit-maint-debrebase.7.pod:547
msgid "and proceed with \"INITIAL DEBIANISATION\"."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:518
+#: ../dgit-maint-debrebase.7.pod:549
msgid ""
"For subsequent releases (whether or not they require additional filtering):"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:523
+#: ../dgit-maint-debrebase.7.pod:554
#, no-wrap
msgid ""
" % git checkout upstream-dfsg\n"
@@ -945,7 +994,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:533
+#: ../dgit-maint-debrebase.7.pod:564
msgid ""
"Our upstream-dfsg branch cannot be pushed to B<dgit-repos>, but since we "
"will need it whenever we import a new upstream version, we must push it "
@@ -954,7 +1003,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:540
+#: ../dgit-maint-debrebase.7.pod:571
#, no-wrap
msgid ""
" % git push --follow-tags -u origin master upstream-dfsg\n"
@@ -962,17 +1011,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:544
+#: ../dgit-maint-debrebase.7.pod:575
msgid "DFSG-non-free: When upstream releases only tarballs"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:553
+#: ../dgit-maint-debrebase.7.pod:584
msgid "In the simplest case,"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:557
+#: ../dgit-maint-debrebase.7.pod:588
#, no-wrap
msgid ""
" % dgit fetch\n"
@@ -981,7 +1030,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:562
+#: ../dgit-maint-debrebase.7.pod:593
msgid ""
"If that fails, because your branch and the NMUers' work represent divergent "
"branches of development, you have a number of options. Here we describe the "
@@ -989,7 +1038,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:566
+#: ../dgit-maint-debrebase.7.pod:597
msgid ""
"Note that you should not try to resolve the divergent branches by editing "
"files in I<debian/patches>. Changes there would either cause trouble, or be "
@@ -997,12 +1046,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:570
+#: ../dgit-maint-debrebase.7.pod:601
msgid "Rebasing your work onto the NMU"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:574
+#: ../dgit-maint-debrebase.7.pod:605
#, no-wrap
msgid ""
" % git rebase dgit/dgit/sid\n"
@@ -1010,14 +1059,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:578
+#: ../dgit-maint-debrebase.7.pod:609
msgid ""
"If the NMUer added new commits modifying the upstream source, you will "
"probably want to debrebase before your next upload to tidy those up."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:581
+#: ../dgit-maint-debrebase.7.pod:612
msgid ""
"For example, the NMUer might have used git-revert(1) to unapply one of your "
"patches. A debrebase can be used to strip both the patch and the reversion "
@@ -1025,12 +1074,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:585
+#: ../dgit-maint-debrebase.7.pod:616
msgid "Manually applying the debdiff"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:587
+#: ../dgit-maint-debrebase.7.pod:618
msgid ""
"If you cannot rebase because you have already pushed to B<salsa.debian.org>, "
"say, you can manually apply the NMU debdiff, commit and debrebase. The next "
@@ -1038,24 +1087,24 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-debrebase.7.pod:592
+#: ../dgit-maint-debrebase.7.pod:623
msgid "HINTS AND TIPS"
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:594
+#: ../dgit-maint-debrebase.7.pod:625
msgid "Minimising pseudomerges"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:596
+#: ../dgit-maint-debrebase.7.pod:627
msgid ""
"Above we noted that each time you conclude a debrebase, you introduce a "
"pseudomerge into your git history, which may make it harder to read."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:599
+#: ../dgit-maint-debrebase.7.pod:630
msgid ""
"A simple convention you can use to minimise the number of pseudomerges is to "
"B<git debrebase conclude> only right before you upload or push to B<salsa."
@@ -1063,7 +1112,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:603
+#: ../dgit-maint-debrebase.7.pod:634
msgid ""
"It is possible, though much less convenient, to reduce the number of "
"pseudomerges yet further. We debrebase only (i) when importing a new "
@@ -1075,12 +1124,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:611
+#: ../dgit-maint-debrebase.7.pod:642
msgid "The debian/patches directory"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:613
+#: ../dgit-maint-debrebase.7.pod:644
msgid ""
"In this workflow, I<debian/patches> is purely an output of git-"
"debrebase(1). You should not make changes there. They will either cause "
@@ -1088,7 +1137,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:618
+#: ../dgit-maint-debrebase.7.pod:649
msgid ""
"I<debian/patches> will often be out-of-date because git-debrebase(1) will "
"only regenerate it when it needs to. So you should not rely on the "
@@ -1098,17 +1147,17 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:624
+#: ../dgit-maint-debrebase.7.pod:655
msgid "Upstream branches"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:626
+#: ../dgit-maint-debrebase.7.pod:657
msgid "In this workflow, we specify upstream tags rather than any branches."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:628
+#: ../dgit-maint-debrebase.7.pod:659
msgid ""
"Except when (i) upstream releases only tarballs, (ii) we require DFSG "
"filtering, or (iii) you also happen to be involved in upstream development, "
@@ -1117,7 +1166,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:634
+#: ../dgit-maint-debrebase.7.pod:665
msgid ""
"The idea here is that from Debian's point of view, upstream releases are "
"immutable points in history. We want to make sure that we are basing our "
@@ -1126,19 +1175,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:640
+#: ../dgit-maint-debrebase.7.pod:671
msgid ""
"Upstream's branches remain available as the git remote tracking branches for "
"your upstream remote, e.g. I<remotes/upstream/master>."
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:643
+#: ../dgit-maint-debrebase.7.pod:674
msgid "The first ever dgit push"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:645
+#: ../dgit-maint-debrebase.7.pod:676
msgid ""
"If this is the first ever dgit push of the package, consider passing I<--"
"deliberately-not-fast-forward> instead of I<--overwrite>. This avoids "
@@ -1148,12 +1197,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:651
+#: ../dgit-maint-debrebase.7.pod:682
msgid "Inspecting the history"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:653
+#: ../dgit-maint-debrebase.7.pod:684
msgid ""
"The git history made by git-debrebase can seem complicated. Here are some "
"suggestions for helpful invocations of gitk and git. They can be adapted "
@@ -1161,12 +1210,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:657
+#: ../dgit-maint-debrebase.7.pod:688
msgid "History of package in Debian, disregarding history from upstream:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:661
+#: ../dgit-maint-debrebase.7.pod:692
#, no-wrap
msgid ""
" % gitk --first-parent\n"
@@ -1174,17 +1223,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:663
+#: ../dgit-maint-debrebase.7.pod:694
msgid "In a laundered branch, the delta queue is at the top."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:667
+#: ../dgit-maint-debrebase.7.pod:698
msgid "History of the packaging, excluding the delta queue:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:669
+#: ../dgit-maint-debrebase.7.pod:700
#, no-wrap
msgid ""
" % gitk :/debian :!/debian/patches\n"
@@ -1192,12 +1241,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:671
+#: ../dgit-maint-debrebase.7.pod:702
msgid "Just the delta queue (i.e. Debian's changes to upstream):"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:673
+#: ../dgit-maint-debrebase.7.pod:704
#, no-wrap
msgid ""
" % gitk --first-parent -- :/ :!/debian\n"
@@ -1205,12 +1254,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:675
+#: ../dgit-maint-debrebase.7.pod:706
msgid "Full history including old versions of the delta queue:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:679
+#: ../dgit-maint-debrebase.7.pod:710
#, no-wrap
msgid ""
" % gitk --date-order\n"
@@ -1218,7 +1267,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:681
+#: ../dgit-maint-debrebase.7.pod:712
msgid ""
"The \"Declare fast forward\" commits you see have an older history (usually, "
"an older delta queue) as one parent, and a newer history as the other. --"
@@ -1226,12 +1275,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:688
+#: ../dgit-maint-debrebase.7.pod:719
msgid "Complete diff since the last upload:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:692
+#: ../dgit-maint-debrebase.7.pod:723
#, no-wrap
msgid ""
" % git diff dgit/dgit/sid..HEAD -- :/ :!/debian/patches\n"
@@ -1239,17 +1288,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:694
+#: ../dgit-maint-debrebase.7.pod:725
msgid "This includes changes to upstream files."
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:698
+#: ../dgit-maint-debrebase.7.pod:729
msgid "Interdiff of delta queue since last upload, if you really want it:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:700
+#: ../dgit-maint-debrebase.7.pod:731
#, no-wrap
msgid ""
" % git debrebase make-patches\n"
@@ -1258,12 +1307,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:703
+#: ../dgit-maint-debrebase.7.pod:734
msgid "And of course there is:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:705
+#: ../dgit-maint-debrebase.7.pod:736
#, no-wrap
msgid ""
" % git debrebase status\n"
@@ -1271,24 +1320,24 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-debrebase.7.pod:707
+#: ../dgit-maint-debrebase.7.pod:738
msgid "Alternative ways to start a debrebase"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:709
+#: ../dgit-maint-debrebase.7.pod:740
msgid ""
"Above we started an interactive debrebase by invoking git-debrebase(1) like "
"this:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:718
+#: ../dgit-maint-debrebase.7.pod:749
msgid "It is also possible to perform a non-interactive rebase, like this:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:722
+#: ../dgit-maint-debrebase.7.pod:753
#, no-wrap
msgid ""
" % git debrebase -- [git-rebase options...]\n"
@@ -1296,7 +1345,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:727
+#: ../dgit-maint-debrebase.7.pod:758
msgid ""
"A third alternative is to have git-debrebase(1) shuffle all the Debian "
"changes to the end of your branch, and then manipulate them yourself using "
@@ -1304,7 +1353,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-debrebase.7.pod:733
+#: ../dgit-maint-debrebase.7.pod:764
#, no-wrap
msgid ""
" % git debrebase\n"
@@ -1313,7 +1362,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:738
+#: ../dgit-maint-debrebase.7.pod:769
msgid ""
"If you take this approach, you should be very careful not to start the "
"rebase too early, including before the most recent pseudomerge. git-rebase "
@@ -1323,6 +1372,6 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-debrebase.7.pod:749
+#: ../dgit-maint-debrebase.7.pod:780
msgid "dgit(1), dgit(7), git-debrebase(1), git-debrebase(5)"
msgstr ""
diff --git a/po4a/dgit-maint-merge_7.pot b/po4a/dgit-maint-merge_7.pot
index 1dbb682..129dca5 100644
--- a/po4a/dgit-maint-merge_7.pot
+++ b/po4a/dgit-maint-merge_7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2018-10-04 01:04+0100\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
@@ -21,36 +21,38 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =item
-#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446
+#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476
#, no-wrap
msgid "1."
msgstr ""
#. type: =item
-#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450
+#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480
#, no-wrap
msgid "2."
msgstr ""
#. type: =item
-#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455
+#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485
#, no-wrap
msgid "3."
msgstr ""
#. type: =head1
-#: ../dgit.1:1394 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../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
+#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
+#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -59,18 +61,18 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
#. type: textblock
#: ../dgit-user.7.pod:449 ../dgit-maint-native.7.pod:128
-#: ../dgit-maint-merge.7.pod:493 ../dgit-maint-gbp.7.pod:138
+#: ../dgit-maint-merge.7.pod:523 ../dgit-maint-gbp.7.pod:138
msgid "dgit(1), dgit(7)"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:484
+#: ../dgit-maint-native.7.pod:107 ../dgit-maint-merge.7.pod:514
#, no-wrap
msgid ""
" % dgit pull\n"
@@ -147,9 +149,9 @@ msgid ""
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:335
-#: ../dgit-maint-merge.7.pod:408 ../dgit-maint-debrebase.7.pod:67
-#: ../dgit-maint-debrebase.7.pod:321
+#: ../dgit-maint-merge.7.pod:53 ../dgit-maint-merge.7.pod:361
+#: ../dgit-maint-merge.7.pod:438 ../dgit-maint-debrebase.7.pod:67
+#: ../dgit-maint-debrebase.7.pod:352
msgid "When upstream tags releases in git"
msgstr ""
@@ -216,8 +218,8 @@ msgid "Finally, you need an orig tarball:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:402
-#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:383
+#: ../dgit-maint-merge.7.pod:97 ../dgit-maint-merge.7.pod:432
+#: ../dgit-maint-debrebase.7.pod:106 ../dgit-maint-debrebase.7.pod:419
#, no-wrap
msgid ""
" % git deborig\n"
@@ -261,21 +263,58 @@ msgid ""
msgstr ""
#. type: =head3
-#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-merge.7.pod:343
-#: ../dgit-maint-merge.7.pod:433 ../dgit-maint-debrebase.7.pod:137
-#: ../dgit-maint-debrebase.7.pod:329
+#: ../dgit-maint-merge.7.pod:123 ../dgit-maint-debrebase.7.pod:137
+msgid "Using untagged upstream commits"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:127 ../dgit-maint-debrebase.7.pod:141
+msgid ""
+"Sometimes upstream does not tag their releases, or you want to package an "
+"unreleased git snapshot. In such a case you can create your own upstream "
+"release tag, of the form B<upstream/>I<ver>, where I<ver> is the upstream "
+"version you plan to put in I<debian/changelog>. The B<upstream/> prefix "
+"ensures that your tag will not clash with any tags upstream later creates."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:134 ../dgit-maint-debrebase.7.pod:148
+msgid ""
+"For example, suppose that the latest upstream release is 1.2.2 and you want "
+"to package git commit ab34c21 which was made on 2013-12-11. A common "
+"convention is to use the upstream version number 1.2.2+git20131211.ab34c21 "
+"and so you could use"
+msgstr ""
+
+#. type: verbatim
+#: ../dgit-maint-merge.7.pod:141 ../dgit-maint-debrebase.7.pod:155
+#, no-wrap
+msgid ""
+" % git tag -s upstream/1.2.2+git20131211.ab34c21 ab34c21\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:159
+msgid "to obtain a release tag, and then proceed as above."
+msgstr ""
+
+#. type: =head3
+#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-merge.7.pod:373
+#: ../dgit-maint-merge.7.pod:463 ../dgit-maint-debrebase.7.pod:163
+#: ../dgit-maint-debrebase.7.pod:364
msgid "When upstream releases only tarballs"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:125
+#: ../dgit-maint-merge.7.pod:151
msgid ""
"We need a virtual upstream branch with virtual release tags. gbp-import-"
"orig(1) can manage this for us. To begin"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:130 ../dgit-maint-debrebase.7.pod:145
+#: ../dgit-maint-merge.7.pod:156 ../dgit-maint-debrebase.7.pod:171
#, no-wrap
msgid ""
" % mkdir foo\n"
@@ -285,12 +324,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:136 ../dgit-maint-debrebase.7.pod:151
+#: ../dgit-maint-merge.7.pod:162 ../dgit-maint-debrebase.7.pod:177
msgid "Now create I<debian/gbp.conf>:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:140 ../dgit-maint-debrebase.7.pod:155
+#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
#, no-wrap
msgid ""
" [DEFAULT]\n"
@@ -301,7 +340,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:145 ../dgit-maint-debrebase.7.pod:160
+#: ../dgit-maint-merge.7.pod:171 ../dgit-maint-debrebase.7.pod:186
#, no-wrap
msgid ""
" sign-tags = True\n"
@@ -311,7 +350,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:149 ../dgit-maint-debrebase.7.pod:164
+#: ../dgit-maint-merge.7.pod:175 ../dgit-maint-debrebase.7.pod:190
#, no-wrap
msgid ""
" [import-orig]\n"
@@ -320,12 +359,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:154 ../dgit-maint-debrebase.7.pod:169
+#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
msgid "gbp-import-orig(1) requires a pre-existing upstream branch:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:158 ../dgit-maint-debrebase.7.pod:173
+#: ../dgit-maint-merge.7.pod:184 ../dgit-maint-debrebase.7.pod:199
#, no-wrap
msgid ""
" % git add debian/gbp.conf && git commit -m \"create gbp.conf\"\n"
@@ -337,12 +376,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:166 ../dgit-maint-debrebase.7.pod:181
+#: ../dgit-maint-merge.7.pod:192 ../dgit-maint-debrebase.7.pod:207
msgid "Then we can import the upstream version:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:170 ../dgit-maint-debrebase.7.pod:185
+#: ../dgit-maint-merge.7.pod:196 ../dgit-maint-debrebase.7.pod:211
#, no-wrap
msgid ""
" % gbp import-orig --merge-mode=replace ../foo_1.2.2.orig.tar.xz\n"
@@ -350,7 +389,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:174 ../dgit-maint-debrebase.7.pod:189
+#: ../dgit-maint-merge.7.pod:200 ../dgit-maint-debrebase.7.pod:215
msgid ""
"Our upstream branch cannot be pushed to B<dgit-repos>, but since we will "
"need it whenever we import a new upstream version, we must push it "
@@ -358,7 +397,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:180 ../dgit-maint-debrebase.7.pod:195
+#: ../dgit-maint-merge.7.pod:206 ../dgit-maint-debrebase.7.pod:221
#, no-wrap
msgid ""
" % git remote add -f origin salsa.debian.org:Debian/foo.git\n"
@@ -367,31 +406,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:185
+#: ../dgit-maint-merge.7.pod:211
msgid ""
"You are now ready to proceed as above, making commits to both the upstream "
"source and the I<debian/> directory."
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:188 ../dgit-maint-debrebase.7.pod:207
+#: ../dgit-maint-merge.7.pod:214 ../dgit-maint-debrebase.7.pod:233
msgid "CONVERTING AN EXISTING PACKAGE"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:190 ../dgit-maint-debrebase.7.pod:209
+#: ../dgit-maint-merge.7.pod:216 ../dgit-maint-debrebase.7.pod:235
msgid ""
"This section explains how to convert an existing Debian package to this "
"workflow. It should be skipped when debianising a new package."
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:193
+#: ../dgit-maint-merge.7.pod:219
msgid "No existing git history"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:197
+#: ../dgit-maint-merge.7.pod:223
#, no-wrap
msgid ""
" % dgit clone foo\n"
@@ -401,19 +440,19 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:203
+#: ../dgit-maint-merge.7.pod:229
msgid "Existing git history using another workflow"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:205
+#: ../dgit-maint-merge.7.pod:231
msgid ""
"First, if you don't already have the git history locally, clone it, and "
"obtain the corresponding orig.tar from the archive:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:210
+#: ../dgit-maint-merge.7.pod:236
#, no-wrap
msgid ""
" % git clone git.debian.org:collab-maint/foo\n"
@@ -423,12 +462,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:216
+#: ../dgit-maint-merge.7.pod:242
msgid "Now dump any existing patch queue:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:220
+#: ../dgit-maint-merge.7.pod:246
#, no-wrap
msgid ""
" % git rm -rf debian/patches\n"
@@ -437,12 +476,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:225
+#: ../dgit-maint-merge.7.pod:251
msgid "Then make new upstream tags available:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:229 ../dgit-maint-debrebase.7.pod:240
+#: ../dgit-maint-merge.7.pod:255 ../dgit-maint-debrebase.7.pod:266
#, no-wrap
msgid ""
" % git remote add -f upstream https://some.upstream/foo.git\n"
@@ -450,12 +489,12 @@ msgid ""
msgstr ""
#. type: =for
-#: ../dgit-maint-merge.7.pod:233
+#: ../dgit-maint-merge.7.pod:259
msgid "dgit-test dpkg-source-ignores begin"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:235
+#: ../dgit-maint-merge.7.pod:261
msgid ""
"Now you simply need to ensure that your git HEAD is dgit-compatible, i.e., "
"it is exactly what you would get if you ran B<dpkg-buildpackage -i'(?:^|/)\\."
@@ -463,19 +502,19 @@ msgid ""
msgstr ""
#. type: =for
-#: ../dgit-maint-merge.7.pod:240
+#: ../dgit-maint-merge.7.pod:266
msgid "dgit-test dpkg-source-ignores end"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:242 ../dgit-maint-debrebase.7.pod:289
+#: ../dgit-maint-merge.7.pod:268 ../dgit-maint-debrebase.7.pod:320
msgid ""
"To achieve this, you might need to delete I<debian/source/local-options>. "
"One way to have dgit check your progress is to run B<dgit build-source>."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:246
+#: ../dgit-maint-merge.7.pod:272
msgid ""
"The first dgit push will require I<--overwrite>. If this is the first ever "
"dgit push of the package, consider passing I<--deliberately-not-fast-"
@@ -486,24 +525,24 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:253
+#: ../dgit-maint-merge.7.pod:279
msgid "SOURCE PACKAGE CONFIGURATION"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:255
+#: ../dgit-maint-merge.7.pod:281
msgid "debian/source/options"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:257
+#: ../dgit-maint-merge.7.pod:283
msgid ""
"We set some source package options such that dgit can transparently handle "
"the \"dropping\" and \"refreshing\" of changes to the upstream source:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:263
+#: ../dgit-maint-merge.7.pod:289
#, no-wrap
msgid ""
" single-debian-patch\n"
@@ -512,26 +551,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:268
+#: ../dgit-maint-merge.7.pod:294
msgid ""
"You don't need to create this file if you are using the version 1.0 source "
"package format."
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:271
+#: ../dgit-maint-merge.7.pod:297
msgid "Sample text for debian/source/patch-header"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:273
+#: ../dgit-maint-merge.7.pod:299
msgid ""
"It is a good idea to explain how a user can obtain a breakdown of the "
"changes to the upstream source:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:278
+#: ../dgit-maint-merge.7.pod:304
msgid ""
"The Debian packaging of foo is maintained in git, using the merging workflow "
"described in dgit-maint-merge(7). There isn't a patch queue that can be "
@@ -539,7 +578,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:282
+#: ../dgit-maint-merge.7.pod:308
msgid ""
"A detailed breakdown of the changes is available from their canonical "
"representation - git commits in the packaging repository. For example, to "
@@ -548,7 +587,7 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:290
+#: ../dgit-maint-merge.7.pod:316
#, no-wrap
msgid ""
" % git clone https://git.dgit.debian.org/foo\n"
@@ -558,18 +597,18 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:296
+#: ../dgit-maint-merge.7.pod:322
msgid ""
"(If you have dgit, use `dgit clone foo`, rather than plain `git clone`.)"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:299
+#: ../dgit-maint-merge.7.pod:325
msgid "A single combined diff, containing all the changes, follows."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:303
+#: ../dgit-maint-merge.7.pod:329
msgid ""
"If you are using the version 1.0 source package format, this text should be "
"added to README.source instead. The version 1.0 source package format "
@@ -577,7 +616,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:307
+#: ../dgit-maint-merge.7.pod:333
msgid ""
"If you're using the version 3.0 (quilt) source package format, you could add "
"this text to README.source instead of debian/source/patch-header, but this "
@@ -585,12 +624,12 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:312 ../dgit-maint-debrebase.7.pod:436
+#: ../dgit-maint-merge.7.pod:338 ../dgit-maint-debrebase.7.pod:472
msgid "BUILDING AND UPLOADING"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:314
+#: ../dgit-maint-merge.7.pod:340
msgid ""
"Use B<dgit build>, B<dgit sbuild>, B<dgit pbuilder>, B<dgit cowbuilder>, "
"B<dgit push-source>, and B<dgit push> as detailed in dgit(1). If any "
@@ -600,7 +639,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:320
+#: ../dgit-maint-merge.7.pod:346
msgid ""
"As an alternative to B<dgit build> and friends, you can use a tool like "
"gitpkg(1). This works because like dgit, gitpkg(1) enforces that HEAD has "
@@ -611,7 +650,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:327
+#: ../dgit-maint-merge.7.pod:353
msgid ""
"If you want to skip dgit's checks while iterating on a problem with the "
"package build (for example, you don't want to commit your changes to git), "
@@ -619,17 +658,17 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:331
+#: ../dgit-maint-merge.7.pod:357
msgid "NEW UPSTREAM RELEASES"
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:333 ../dgit-maint-debrebase.7.pod:319
+#: ../dgit-maint-merge.7.pod:359 ../dgit-maint-debrebase.7.pod:350
msgid "Obtaining the release"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:339 ../dgit-maint-debrebase.7.pod:325
+#: ../dgit-maint-merge.7.pod:365 ../dgit-maint-debrebase.7.pod:356
#, no-wrap
msgid ""
" % git remote update\n"
@@ -637,7 +676,15 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:345 ../dgit-maint-debrebase.7.pod:331
+#: ../dgit-maint-merge.7.pod:369 ../dgit-maint-debrebase.7.pod:360
+msgid ""
+"If you want to package an untagged upstream commit (because upstream does "
+"not tag releases or because you want to package an upstream development "
+"snapshot), see \"Using untagged upstream commits\" above."
+msgstr ""
+
+#. type: textblock
+#: ../dgit-maint-merge.7.pod:375 ../dgit-maint-debrebase.7.pod:366
msgid ""
"You will need the I<debian/gbp.conf> from \"When upstream releases only "
"tarballs\", above. You will also need your upstream branch. Above, we "
@@ -646,12 +693,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:350 ../dgit-maint-debrebase.7.pod:336
+#: ../dgit-maint-merge.7.pod:380 ../dgit-maint-debrebase.7.pod:371
msgid "Then, either"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:354 ../dgit-maint-debrebase.7.pod:340
+#: ../dgit-maint-merge.7.pod:384 ../dgit-maint-debrebase.7.pod:375
#, no-wrap
msgid ""
" % gbp import-orig --no-merge ../foo_1.2.3.orig.tar.xz\n"
@@ -659,12 +706,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:358 ../dgit-maint-debrebase.7.pod:344
+#: ../dgit-maint-merge.7.pod:388 ../dgit-maint-debrebase.7.pod:379
msgid "or if you have a working watch file"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:362 ../dgit-maint-debrebase.7.pod:348
+#: ../dgit-maint-merge.7.pod:392 ../dgit-maint-debrebase.7.pod:383
#, no-wrap
msgid ""
" % gbp import-orig --no-merge --uscan\n"
@@ -672,12 +719,12 @@ msgid ""
msgstr ""
#. type: =head2
-#: ../dgit-maint-merge.7.pod:366
+#: ../dgit-maint-merge.7.pod:396
msgid "Reviewing & merging the release"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:368
+#: ../dgit-maint-merge.7.pod:398
msgid ""
"It's a good idea to preview the merge of the new upstream release. First, "
"just check for any new or deleted files that may need accounting for in your "
@@ -685,20 +732,20 @@ msgid ""
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:374
+#: ../dgit-maint-merge.7.pod:404
#, no-wrap
msgid ""
-" % git diff --stat master..1.2.3 -- . ':!debian'\n"
+" % git diff --name-status --diff-filter=ADR master..1.2.3 -- . ':!debian'\n"
"\n"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:378
+#: ../dgit-maint-merge.7.pod:408
msgid "You can then review the full merge diff:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:382
+#: ../dgit-maint-merge.7.pod:412
#, no-wrap
msgid ""
" % git merge-tree `git merge-base master 1.2.3` master 1.2.3 | $PAGER\n"
@@ -706,12 +753,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:386
+#: ../dgit-maint-merge.7.pod:416
msgid "Once you're satisfied with what will be merged, update your package:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:390
+#: ../dgit-maint-merge.7.pod:420
#, no-wrap
msgid ""
" % git merge 1.2.3\n"
@@ -721,7 +768,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:396 ../dgit-maint-debrebase.7.pod:377
+#: ../dgit-maint-merge.7.pod:426 ../dgit-maint-debrebase.7.pod:413
msgid ""
"If you obtained a tarball from upstream, you are ready to try a build. If "
"you merged a git tag from upstream, you will first need to generate a "
@@ -729,17 +776,17 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:406 ../dgit-maint-debrebase.7.pod:461
+#: ../dgit-maint-merge.7.pod:436 ../dgit-maint-debrebase.7.pod:503
msgid "HANDLING DFSG-NON-FREE MATERIAL"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:410
+#: ../dgit-maint-merge.7.pod:440
msgid "We create a DFSG-clean tag to merge to master:"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:414
+#: ../dgit-maint-merge.7.pod:444
#, no-wrap
msgid ""
" % git checkout -b pre-dfsg 1.2.3\n"
@@ -752,7 +799,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:423
+#: ../dgit-maint-merge.7.pod:453
msgid ""
"Before merging the new 1.2.3+dfsg tag to master, you should first determine "
"whether it would be legally dangerous for the non-free material to be "
@@ -760,7 +807,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:428
+#: ../dgit-maint-merge.7.pod:458
msgid ""
"If it would be dangerous, there is a big problem; in this case please "
"consult your archive administrators (for Debian this is the dgit "
@@ -769,7 +816,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:435 ../dgit-maint-debrebase.7.pod:521
+#: ../dgit-maint-merge.7.pod:465 ../dgit-maint-debrebase.7.pod:577
msgid ""
"The easiest way to handle this is to add a B<Files-Excluded> field to "
"I<debian/copyright>, and a B<uversionmangle> setting in I<debian/watch>. "
@@ -778,40 +825,40 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:440
+#: ../dgit-maint-merge.7.pod:470
msgid "FORWARDING PATCHES UPSTREAM"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:442
+#: ../dgit-maint-merge.7.pod:472
msgid "The basic steps are:"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:448
+#: ../dgit-maint-merge.7.pod:478
msgid "Create a new branch based off upstream's master branch."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:452
+#: ../dgit-maint-merge.7.pod:482
msgid ""
"git-cherry-pick(1) commits from your master branch onto your new branch."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:457
+#: ../dgit-maint-merge.7.pod:487
msgid ""
"Push the branch somewhere and ask upstream to merge it, or use git-format-"
"patch(1) or git-request-pull(1)."
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:462
+#: ../dgit-maint-merge.7.pod:492
msgid "For example (and it is only an example):"
msgstr ""
#. type: verbatim
-#: ../dgit-maint-merge.7.pod:466
+#: ../dgit-maint-merge.7.pod:496
#, no-wrap
msgid ""
" % # fork foo.git on GitHub\n"
@@ -825,7 +872,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:476
+#: ../dgit-maint-merge.7.pod:506
msgid ""
"Note that when you merge an upstream release containing your forwarded "
"patches, git and dgit will transparently handle \"dropping\" the patches "
@@ -833,26 +880,27 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:480 ../dgit-maint-gbp.7.pod:130
-#: ../dgit-maint-debrebase.7.pod:526
+#: ../dgit-maint-merge.7.pod:510 ../dgit-maint-gbp.7.pod:130
+#: ../dgit-maint-debrebase.7.pod:582
msgid "INCORPORATING NMUS"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:488
+#: ../dgit-maint-merge.7.pod:518
msgid ""
"Alternatively, you can apply the NMU diff to your repository. The next push "
"will then require I<--overwrite>."
msgstr ""
#. type: =head1
-#: ../dgit-maint-merge.7.pod:495 ../dgit-maint-gbp.7.pod:140
-#: ../dgit-maint-debrebase.7.pod:726
+#: ../dgit-maint-merge.7.pod:525 ../dgit-maint-gbp.7.pod:140
+#: ../dgit-maint-debrebase.7.pod:782 ../dgit-maint-bpo.7.pod:138
+#: ../git-debpush.1.pod:228
msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: ../dgit-maint-merge.7.pod:497 ../dgit-maint-debrebase.7.pod:728
+#: ../dgit-maint-merge.7.pod:527 ../dgit-maint-debrebase.7.pod:784
msgid ""
"This tutorial was written and is maintained by Sean Whitton "
"<spwhitton@spwhitton.name>. It contains contributions from other dgit "
diff --git a/po4a/dgit_1.pot b/po4a/dgit_1.pot
index 052904f..3d6de78 100644
--- a/po4a/dgit_1.pot
+++ b/po4a/dgit_1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-08-10 19:42+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"
@@ -33,7 +33,8 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
@@ -43,8 +44,8 @@ msgstr ""
msgid "dgit - git integration with the Debian archive"
msgstr ""
-#. type: SH
-#: ../dgit.1:6
+#. type: =head1
+#: ../dgit.1:6 ../git-debpush.1.pod:5
#, no-wrap
msgid "SYNOPSIS"
msgstr ""
@@ -89,8 +90,8 @@ msgstr ""
msgid "B<dgit> [I<dgit-opts>] I<action> ..."
msgstr ""
-#. type: SH
-#: ../dgit.1:33
+#. type: =head1
+#: ../dgit.1:33 ../git-debpush.1.pod:9
#, no-wrap
msgid "DESCRIPTION"
msgstr ""
@@ -417,7 +418,7 @@ msgid "B<dgit help>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:185 ../dgit.1:1192
+#: ../dgit.1:185 ../dgit.1:1269
msgid "Print a usage summary."
msgstr ""
@@ -594,7 +595,7 @@ msgid ""
msgstr ""
#. type: =item
-#: ../dgit.1:286 ../dgit-maint-merge.7.pod:446
+#: ../dgit.1:286 ../dgit-maint-merge.7.pod:476
#, no-wrap
msgid "1."
msgstr ""
@@ -606,7 +607,7 @@ msgid "Clone on build host (dgit clone)"
msgstr ""
#. type: =item
-#: ../dgit.1:287 ../dgit-maint-merge.7.pod:450
+#: ../dgit.1:287 ../dgit-maint-merge.7.pod:480
#, no-wrap
msgid "2."
msgstr ""
@@ -618,7 +619,7 @@ msgid "Edit code on build host (edit, git commit)"
msgstr ""
#. type: =item
-#: ../dgit.1:288 ../dgit-maint-merge.7.pod:455
+#: ../dgit.1:288 ../dgit-maint-merge.7.pod:485
#, no-wrap
msgid "3."
msgstr ""
@@ -955,7 +956,7 @@ msgid "This function is primarily provided for the benefit of git-debrebase."
msgstr ""
#. type: =head1
-#: ../dgit.1:496 ../git-debrebase.1.pod:462
+#: ../dgit.1:496 ../git-debrebase.1.pod:476
#, no-wrap
msgid "OPTIONS"
msgstr ""
@@ -1228,25 +1229,36 @@ msgid ""
"won't make broken pushes.)"
msgstr ""
+#. type: Plain text
+#: ../dgit.1:657
+msgid ""
+"Note that this does B<not> prevent dgit from cleaning your tree, so if the "
+"changes in your working tree are in the form of untracked files, those might "
+"still be deleted, especially with --clean=git. If you want to include "
+"untracked files in the build, you can use --clean=none or --clean=dpkg-"
+"source[-d] in addition to --include-dirty. Note that this combination can "
+"fail if the untracked files are under I<debian/patches/>."
+msgstr ""
+
#. type: TP
-#: ../dgit.1:645
+#: ../dgit.1:657
#, no-wrap
msgid "B<--ignore-dirty>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:648
+#: ../dgit.1:660
msgid "Deprecated alias for --include-dirty."
msgstr ""
#. type: TP
-#: ../dgit.1:648
+#: ../dgit.1:660
#, no-wrap
msgid "B<--overwrite>[=I<previous-version>]"
msgstr ""
#. type: Plain text
-#: ../dgit.1:659
+#: ../dgit.1:671
msgid ""
"Declare that your HEAD really does contain all the (wanted) changes from all "
"versions listed in its changelog; or, all (wanted) changes from I<previous-"
@@ -1255,14 +1267,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:666
+#: ../dgit.1:678
msgid ""
"It is safer not to specify I<previous-version>, and usually it's not "
"needed. Just say B<--overwrite>, unless you know what you are doing."
msgstr ""
#. type: Plain text
-#: ../dgit.1:670
+#: ../dgit.1:682
msgid ""
"This option is useful if you are the maintainer, and you have incorporated "
"NMU changes into your own git workflow in a way that doesn't make your "
@@ -1270,14 +1282,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:676
+#: ../dgit.1:688
msgid ""
"This option is also usually necessary the first time a package is pushed "
"with dgit push to a particular suite. See B<dgit-maint->I<*>B<(7)>."
msgstr ""
#. type: Plain text
-#: ../dgit.1:690
+#: ../dgit.1:702
msgid ""
"If I<previous-version> is not specified, dgit will check that the version in "
"the archive is mentioned in your debian/changelog. (This will avoid losing "
@@ -1288,7 +1300,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:696
+#: ../dgit.1:708
msgid ""
"dgit push --overwrite will, if necessary, make a pseudo-merge (that is, "
"something that looks like the result of git merge -s ours) to stitch the "
@@ -1297,26 +1309,26 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:701
+#: ../dgit.1:713
msgid ""
-"(In quilt mode B<gbp>, B<dpm> or B<unpatched>, implying a split between the "
-"dgit view and the maintainer view, the pseudo-merge will appear only in the "
-"dgit view.)"
+"(In quilt mode B<gbp>, B<dpm>, B<unpatched> or B<baredebian>*, implying a "
+"split between the dgit view and the maintainer view, the pseudo-merge will "
+"appear only in the dgit view.)"
msgstr ""
#. type: TP
-#: ../dgit.1:701
+#: ../dgit.1:713
#, no-wrap
msgid "B<--delayed>=I<days>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:704
+#: ../dgit.1:716
msgid "Upload to a DELAYED queue."
msgstr ""
#. type: Plain text
-#: ../dgit.1:714
+#: ../dgit.1:726
msgid ""
"B<WARNING:> If the maintainer responds by cancelling your upload from the "
"queue, and does not make an upload of their own, this will not rewind the "
@@ -1326,27 +1338,27 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:719
+#: ../dgit.1:731
msgid ""
"If this situation arises, someone should make a suitable dgit push to update "
"the contents of dgit-repos to a version without the controversial changes."
msgstr ""
#. type: TP
-#: ../dgit.1:719
+#: ../dgit.1:731
#, no-wrap
msgid "B<--no-chase-dsc-distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:725
+#: ../dgit.1:737
msgid ""
"Tells dgit not to look online for additional git repositories containing "
"information about a particular .dsc being imported. Chasing is the default."
msgstr ""
#. type: Plain text
-#: ../dgit.1:735
+#: ../dgit.1:747
msgid ""
"For most operations (such as fetch and pull), disabling chasing means dgit "
"will access only the git server for the distro you are directly working "
@@ -1355,7 +1367,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:743
+#: ../dgit.1:755
msgid ""
"Disabling chasing can be hazardous: if the .dsc names a git commit which has "
"been rewritten by those in charge of the distro, this option may prevent "
@@ -1364,48 +1376,48 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:743
+#: ../dgit.1:755
#, no-wrap
msgid "B<--save-dgit-view=>I<branch>|I<ref>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:753
+#: ../dgit.1:765
msgid ""
-"Specifies that when a split view quilt mode is in operation, and dgit "
-"calculates (or looks up in its cache) a dgit view corresponding to your "
-"HEAD, the dgit view will be left in I<ref>. The specified ref is "
-"unconditionally overwritten, so don't specify a branch you want to keep."
+"Specifies that when split view is in operation, and dgit calculates (or "
+"looks up in its cache) a dgit view corresponding to your HEAD, the dgit "
+"view will be left in I<ref>. The specified ref is unconditionally "
+"overwritten, so don't specify a branch you want to keep."
msgstr ""
#. type: Plain text
-#: ../dgit.1:760
+#: ../dgit.1:769
msgid ""
"This option is effective only with the following operations: quilt-fixup; "
-"push; all builds. And it is only effective with --[quilt=]gbp, --"
-"[quilt=]dpm, --quilt=unpatched."
+"push; all builds. And it is only effective when split view is actually in "
+"operation."
msgstr ""
#. type: Plain text
-#: ../dgit.1:764
+#: ../dgit.1:773
msgid ""
"If ref does not start with refs/ it is taken to be a branch - i.e. refs/"
"heads/ is prepended."
msgstr ""
#. type: Plain text
-#: ../dgit.1:768
+#: ../dgit.1:777
msgid "B<--dgit-view-save> is a deprecated alias for --save-dgit-view."
msgstr ""
#. type: TP
-#: ../dgit.1:768
+#: ../dgit.1:777
#, no-wrap
msgid "B<--deliberately->I<something>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:782
+#: ../dgit.1:791
msgid ""
"Declare that you are deliberately doing I<something>. This can be used to "
"override safety catches, including safety catches which relate to distro-"
@@ -1417,13 +1429,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:782
+#: ../dgit.1:791
#, no-wrap
msgid "B<--deliberately-not-fast-forward>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:788
+#: ../dgit.1:797
msgid ""
"Declare that you are deliberately rewinding history. When pushing to "
"Debian, use this when you are making a renewed upload of an entirely new "
@@ -1432,23 +1444,23 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:799
+#: ../dgit.1:808
msgid ""
-"In split view quilt modes, this also prevents the construction by dgit of a "
-"pseudomerge to make the dgit view fast forwarding. Normally only one of --"
-"overwrite (which creates a suitable pseudomerge) and --deliberately-not-"
-"fast-forward (which suppresses the pseudomerge and the fast forward checks) "
-"should be needed; --overwrite is usually better."
+"When split view is in operation, this also prevents the construction by dgit "
+"of a pseudomerge to make the dgit view fast forwarding. Normally only one "
+"of --overwrite (which creates a suitable pseudomerge) and --deliberately-"
+"not-fast-forward (which suppresses the pseudomerge and the fast forward "
+"checks) should be needed; --overwrite is usually better."
msgstr ""
#. type: TP
-#: ../dgit.1:799
+#: ../dgit.1:808
#, no-wrap
msgid "B<--deliberately-include-questionable-history>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:808
+#: ../dgit.1:817
msgid ""
"Declare that you are deliberately including, in the git history of your "
"current push, history which contains a previously-submitted version of this "
@@ -1460,27 +1472,27 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:808
+#: ../dgit.1:817
#, no-wrap
msgid "B<--deliberately-fresh-repo>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:813
+#: ../dgit.1:822
msgid ""
"Declare that you are deliberately rewinding history and want to throw away "
"the existing repo. Not relevant when pushing to Debian, as the Debian "
"server will do this automatically when necessary."
msgstr ""
-#. type: TP
-#: ../dgit.1:813
+#. type: =item
+#: ../dgit.1:822 ../git-debpush.1.pod:112
#, no-wrap
msgid "B<--quilt=linear>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:820
+#: ../dgit.1:829
msgid ""
"When fixing up source format `3.0 (quilt)' metadata, insist on generating a "
"linear patch stack: one new patch for each relevant commit. If such a stack "
@@ -1488,36 +1500,36 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:825
+#: ../dgit.1:834
msgid ""
"HEAD should be a series of plain commits (not touching debian/patches/), and "
"pseudomerges, with as ancestor a patches-applied branch."
msgstr ""
-#. type: TP
-#: ../dgit.1:825
+#. type: =item
+#: ../dgit.1:834 ../git-debpush.1.pod:124
#, no-wrap
msgid "B<--quilt=auto>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:834
+#: ../dgit.1:843
msgid ""
"When fixing up source format `3.0 (quilt)' metadata, prefer to generate a "
-"linear patch stack (as with --quilt=auto) but if that doesn't seem "
+"linear patch stack (as with --quilt=linear) but if that doesn't seem "
"possible, try to generate a single squashed patch for all the changes made "
"in git (as with --quilt=smash). This is not a good idea for an NMU in "
"Debian."
msgstr ""
-#. type: TP
-#: ../dgit.1:834
+#. type: =item
+#: ../dgit.1:843 ../git-debpush.1.pod:118
#, no-wrap
msgid "B<--quilt=smash>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:839
+#: ../dgit.1:848
msgid ""
"When fixing up source format `3.0 (quilt)' metadata, generate a single "
"additional patch for all the changes made in git. This is not a good idea "
@@ -1525,7 +1537,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:845
+#: ../dgit.1:854
msgid ""
"(If HEAD has any in-tree patches already, they must apply cleanly. This "
"will be the case for any trees produced by dgit fetch or clone; if you do "
@@ -1533,14 +1545,14 @@ msgid ""
"remain true.)"
msgstr ""
-#. type: TP
-#: ../dgit.1:845
+#. type: =item
+#: ../dgit.1:854 ../git-debpush.1.pod:129
#, no-wrap
msgid "B<--quilt=nofix>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:853
+#: ../dgit.1:862
msgid ""
"Check whether source format `3.0 (quilt)' metadata would need fixing up, "
"but, if it does, fail. You must then fix the metadata yourself somehow "
@@ -1549,13 +1561,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:853
+#: ../dgit.1:862
#, no-wrap
msgid "B<--quilt=nocheck> | B<--no-quilt-fixup>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:858
+#: ../dgit.1:867
msgid ""
"Do not check whether source format `3.0 (quilt)' metadata needs fixing up. "
"If you use this option and the metadata did in fact need fixing up, dgit "
@@ -1563,20 +1575,27 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:858
+#: ../dgit.1:867
#, no-wrap
-msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied>"
+msgid "B<-->[B<quilt=>]B<gbp> | B<-->[B<quilt=>]B<dpm> | B<--quilt=unapplied> | B<-->[B<quilt=>]B<baredebian>[B<+git>|B<+tarball>]"
msgstr ""
#. type: Plain text
-#: ../dgit.1:865
+#: ../dgit.1:874
msgid ""
"Tell dgit that you are using a nearly-dgit-compatible git branch, aka a "
"B<maintainer view>, and do not want your branch changed by dgit."
msgstr ""
#. type: Plain text
-#: ../dgit.1:873
+#: ../dgit.1:878
+msgid ""
+"These quilt modes are known as B<splitting quilt modes>. See --split-view, "
+"below."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:886
msgid ""
"B<--gbp> (short for B<--quilt=gbp>) is for use with git-buildpackage. Your "
"HEAD is expected to be a patches-unapplied git branch, except that it might "
@@ -1585,7 +1604,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:881
+#: ../dgit.1:894
msgid ""
"B<--dpm> (short for B<--quilt=dpm>) is for use with git-dpm. Your HEAD is "
"expected to be a patches-applied git branch, except that it might contain "
@@ -1593,7 +1612,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:886
+#: ../dgit.1:899
msgid ""
"B<--quilt=unapplied> specifies that your HEAD is a patches-unapplied git "
"branch (and that any changes to upstream .gitignore files are represented as "
@@ -1601,20 +1620,44 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:904
+#: ../dgit.1:913
msgid ""
-"With --quilt=gbp|dpm|unapplied, dgit push (or precursors like quilt-fixup "
-"and build) will automatically generate a conversion of your git branch into "
-"the right form. dgit push will push the dgit-compatible form (the B<dgit "
-"view>) to the dgit git server. The dgit view will be visible to you in the "
-"dgit remote tracking branches, but your own branch will not be modified. "
-"dgit push will create a tag B<debian/>I<version> for the maintainer view, "
-"and the dgit tag B<archive/debian/>I<version> for the dgit view. dgit quilt-"
-"fixup will merely do some checks, and cache the maintainer view."
+"B<--quilt=baredebian> (or its alias B<--quilt=baredebian+git>) specifies "
+"that your HEAD contains only a debian/ directory, with any changes to "
+"upstream files represented as patches in debian/patches. The upstream "
+"source must be available in git, by default, in a suitably named git tag; "
+"see --upstream-commitish. In this mode, dgit cannot check that all edited "
+"upstream files are properly represented as patches: dgit relies on debian/"
+"patches being correct."
msgstr ""
#. type: Plain text
-#: ../dgit.1:913
+#: ../dgit.1:924
+msgid ""
+"B<--quilt=baredebian+tarball> is like --quilt=baredebian, but is used when "
+"there is no appropriate upstream git history. To construct the dgit view, "
+"dgit will import your orig tarballs' contents into git. In this mode, dgit "
+"cannot check that the upstream parts of your upload correspond to what you "
+"intend: dgit relies on the right orig tarball(s) existing, and debian/"
+"patches being correct."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:942
+msgid ""
+"With --quilt=gbp|dpm|unapplied|baredebian*, dgit push (or precursors like "
+"quilt-fixup and build) will automatically generate a conversion of your git "
+"branch into the right form. dgit push will push the dgit-compatible form "
+"(the B<dgit view>) to the dgit git server. The dgit view will be visible "
+"to you in the dgit remote tracking branches, but your own branch will not be "
+"modified. dgit push will create a tag B<debian/>I<version> for the "
+"maintainer view, and the dgit tag B<archive/debian/>I<version> for the dgit "
+"view. dgit quilt-fixup will merely do some checks, and cache the maintainer "
+"view."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:951
msgid ""
"B<If you have a branch like this it is essential to specify the appropriate "
"--quilt= option!> This is because it is not always possible to tell: a "
@@ -1626,13 +1669,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:913
+#: ../dgit.1:951
#, no-wrap
msgid "B<-d>I<distro> | B<--distro=>I<distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:922
+#: ../dgit.1:960
msgid ""
"Specifies that the suite to be operated on is part of distro I<distro>. "
"This overrides the default value found from the git config option B<dgit-"
@@ -1642,7 +1685,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:928
+#: ../dgit.1:966
msgid ""
"If your suite is part of a distro that dgit already knows about, you can use "
"this option to make dgit work even if your dgit doesn't know about the "
@@ -1651,7 +1694,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:933
+#: ../dgit.1:971
msgid ""
"To define a new distro it is necessary to define methods and URLs for "
"fetching (and, for dgit push, altering) a variety of information both in the "
@@ -1659,13 +1702,70 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:933
+#: ../dgit.1:971
+#, no-wrap
+msgid "B<--split-view=auto>|B<always>|B<never>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:976
+msgid ""
+"Controls whether dgit operates a split view, separating your own branch (as "
+"Debian maintainer) from that shown to users of dgit clone and dgit fetch."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:984
+msgid ""
+"When split view is in operation dgit will not make or merge any commits onto "
+"your own branch. Specifically, only the dgit view will contain dgit's "
+"pseudomerges, which bring into the git history previous uploads made with "
+"dgit push, and any commits in debian/patches required to make a correct `3.0 "
+"(quilt)' source package."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:990
+msgid ""
+"B<auto> is the default, and splits the view only when needed: i.e., when you "
+"are working with a `3.0 (quilt)' source package and a splitting quilt mode: "
+"--[quilt=]gbp, dpm, unpatched or baredebian*."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:993
+msgid ""
+"B<always> splits the view regardless of the source format and the quilt mode."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:996
+msgid "B<never> will cause dgit to fail if split view is needed."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1004
+msgid ""
+"When split view is in operation, the dgit view is visible in your local git "
+"clone, but only in refs specific to dgit: notably B<remotes/dgit/dgit/"
+">I<suite> and B<archive/>I<distro>B</>I<version>."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1007
+msgid ""
+"Note that split view does not affect dgit fetch, and is not compatible with "
+"dgit pull."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1007
#, no-wrap
msgid "B<-C>I<changesfile>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:938
+#: ../dgit.1:1012
msgid ""
"Specifies the .changes file which is to be uploaded. By default dgit push "
"looks for a single .changes file in the parent directory whose filename "
@@ -1673,7 +1773,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:947
+#: ../dgit.1:1021
msgid ""
"If the specified I<changesfile> pathname contains slashes, the directory "
"part is also used as the value for B<--build-products-dir>; otherwise, the "
@@ -1681,13 +1781,28 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:947
+#: ../dgit.1:1021
+#, no-wrap
+msgid "B<--upstream-commitish=>I<upstream>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1029
+msgid ""
+"For use with --quilt=baredebian only. Specifies the commit containing the "
+"upstream source. This commit must be identical to your .orig tarball. The "
+"default is to look for one of the git tags I<U>B< v>I<U>B< upstream/>I<U> "
+"(in that order), where U is the upstream version."
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1029
#, no-wrap
msgid "B<--rm-old-changes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:959
+#: ../dgit.1:1041
msgid ""
"When doing a build, delete any changes files matching "
"I<package>B<_>I<version>B<_*.changes> before starting. This ensures that "
@@ -1699,32 +1814,32 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:962
+#: ../dgit.1:1044
msgid ""
"Note that B<dgit push-source> will always find the right .changes, "
"regardless of this option."
msgstr ""
#. type: TP
-#: ../dgit.1:962
+#: ../dgit.1:1044
#, no-wrap
msgid "B<--build-products-dir=>I<directory>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:966
+#: ../dgit.1:1048
msgid ""
"Specifies where to find and create tarballs, binary packages, source "
"packages, .changes files, and so on."
msgstr ""
#. type: Plain text
-#: ../dgit.1:969
+#: ../dgit.1:1051
msgid "By default, dgit uses the parent directory (B<..>)."
msgstr ""
#. type: Plain text
-#: ../dgit.1:978
+#: ../dgit.1:1060
msgid ""
"Changing this setting may necessitate moving .orig tarballs to the new "
"directory, so it is probably best to use the B<dgit.default.build-products-"
@@ -1733,90 +1848,85 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:978
+#: ../dgit.1:1060
#, no-wrap
msgid "B<--no-rm-on-error>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:981
+#: ../dgit.1:1063
msgid "Do not delete the destination directory if clone fails."
msgstr ""
#. type: TP
-#: ../dgit.1:981
+#: ../dgit.1:1063
#, no-wrap
msgid "B<--dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:988
+#: ../dgit.1:1070
msgid ""
"Generates a DEP-14 tag (eg B<debian/>I<version>) as well as a dgit tag (eg "
-"B<archive/debian/>I<version>) where possible. This is the default."
+"B<archive/debian/>I<version>). This is the default."
msgstr ""
#. type: TP
-#: ../dgit.1:988
+#: ../dgit.1:1070
#, no-wrap
msgid "B<--no-dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:994
-msgid ""
-"Do not generate a DEP-14 tag, except in split quilt view mode. (On servers "
-"where only the old tag format is supported, the dgit tag will have the "
-"DEP-14 name. This option does not prevent that.)"
+#: ../dgit.1:1073
+msgid "Do not generate a DEP-14 tag, except when split view is in operation."
msgstr ""
#. type: TP
-#: ../dgit.1:994
+#: ../dgit.1:1073
#, no-wrap
-msgid "B<--dep14tag-always>"
+msgid "B<--always-dep14tag>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:999
-msgid ""
-"Insist on generating a DEP-14 tag as well as a dgit tag. If the server does "
-"not support that, dgit push will fail."
+#: ../dgit.1:1076
+msgid "Obsolete alias for --dep14tag, retained for compatibility."
msgstr ""
#. type: TP
-#: ../dgit.1:999
+#: ../dgit.1:1076
#, no-wrap
msgid "B<-D>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1003
+#: ../dgit.1:1080
msgid ""
"Prints debugging information to stderr. Repeating the option produces more "
"output (currently, up to -DDDD is meaningfully different)."
msgstr ""
#. type: TP
-#: ../dgit.1:1003
+#: ../dgit.1:1080
#, no-wrap
msgid "B<-c>I<name>B<=>I<value>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1007
+#: ../dgit.1:1084
msgid ""
"Specifies a git configuration option, to be used for this run. dgit itself "
"is also controlled by git configuration options."
msgstr ""
#. type: TP
-#: ../dgit.1:1007
+#: ../dgit.1:1084
#, no-wrap
msgid "B<-v>I<version>|B<_> | B<--since-version=>versionI<|>B<_>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1016
+#: ../dgit.1:1093
msgid ""
"Specifies the B<-v>I<version> option to pass to dpkg-genchanges, during "
"builds. Changes (from debian/changelog) since this version will be included "
@@ -1826,7 +1936,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1022
+#: ../dgit.1:1099
msgid ""
"Specifying B<_> inhibits this, so that no -v option will be passed to dpkg-"
"genchanges (and as a result, only the last stanza from debian/changelog will "
@@ -1834,30 +1944,30 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1022
+#: ../dgit.1:1099
#, no-wrap
msgid "B<-m>I<maintaineraddress>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1025
+#: ../dgit.1:1102
msgid "Passed to dpkg-genchanges (eventually)."
msgstr ""
#. type: TP
-#: ../dgit.1:1025
+#: ../dgit.1:1102
#, no-wrap
msgid "B<--ch:>I<option>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1029
+#: ../dgit.1:1106
msgid ""
"Specifies a single additional option to pass, eventually, to dpkg-genchanges."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1036
+#: ../dgit.1:1113
msgid ""
"Options which are safe to pass include B<-C> (and also B<-si -sa -sd> "
"although these should never be necessary with Debian since dgit "
@@ -1865,18 +1975,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1038
+#: ../dgit.1:1115
msgid "For other options the caveat below applies."
msgstr ""
#. type: TP
-#: ../dgit.1:1038
+#: ../dgit.1:1115
#, no-wrap
msgid "B<--curl:>I<option> | B<--dput:>I<option> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1060
+#: ../dgit.1:1137
msgid ""
"Specifies a single additional option to pass to B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
@@ -1886,7 +1996,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1068
+#: ../dgit.1:1145
msgid ""
"Use of this ability should not normally be necessary. It is provided for "
"working around bugs, or other unusual situations. If you use these options, "
@@ -1895,7 +2005,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1073
+#: ../dgit.1:1150
msgid ""
"For dpkg-buildpackage, dpkg-genchanges, mergechanges and sbuild, the option "
"applies only when the program is invoked directly by dgit. Usually, for "
@@ -1903,7 +2013,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1077
+#: ../dgit.1:1154
msgid ""
"Specifying --git is not effective for some lower-level read-only git "
"operations performed by dgit, and also not when git is invoked by another "
@@ -1911,39 +2021,39 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1079
+#: ../dgit.1:1156
msgid "See notes below regarding ssh and dgit."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1087
+#: ../dgit.1:1164
msgid ""
"NB that --gpg:option is not supported (because debsign does not have that "
"facility). But see B<-k> and the B<keyid> distro config setting."
msgstr ""
#. type: TP
-#: ../dgit.1:1087
+#: ../dgit.1:1164
#, no-wrap
msgid "B<--curl!:>I<option> | B<--dput!:>I<option> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1093
+#: ../dgit.1:1170
msgid ""
"Specifies an option to remove from the command line for a program called by "
"dgit, as for B<-->I<program>B<:>I<option> (and the same caveats apply)."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1098
+#: ../dgit.1:1175
msgid ""
"Any options or arguments exactly identical to I<option> are removed. (It is "
"not an error if there were none.)"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1105
+#: ../dgit.1:1182
msgid ""
"This can only be used to delete options which are always passed by default "
"by dgit, or to undo a previous B<-->I<program>B<:>I<option>. It cannot be "
@@ -1951,13 +2061,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1105
+#: ../dgit.1:1182
#, no-wrap
msgid "B<--curl=>I<program> | B<--dput=>I<program> |..."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1128
+#: ../dgit.1:1205
msgid ""
"Specifies alternative programs to use instead of B<curl>, B<dput>, "
"B<debsign>, B<dpkg-source>, B<dpkg-buildpackage>, B<dpkg-genchanges>, "
@@ -1967,14 +2077,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1136
+#: ../dgit.1:1213
msgid ""
"For B<dpkg-buildpackage>, B<dpkg-genchanges>, B<mergechanges> and B<sbuild>, "
"this applies only when the program is invoked directly by dgit."
msgstr ""
#. type: Plain text
-#: ../dgit.1:1143
+#: ../dgit.1:1220
msgid ""
"For B<dgit>, specifies the command to run on the remote host when dgit rpush "
"needs to invoke a remote copy of itself. (dgit also reinvokes itself as the "
@@ -1983,7 +2093,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1154
+#: ../dgit.1:1231
msgid ""
"B<gbp-build>'s value is used instead of gbp build or git-buildpackage. (The "
"default is the latter unless the former exists on PATH.) B<gbp-pq>'s value "
@@ -1993,7 +2103,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1162
+#: ../dgit.1:1239
msgid ""
"For pbuilder and cowbuilder, the defaults are B<sudo -E pbuilder> and B<sudo "
"-E cowbuilder> respectively. Like with gbp-build and gbp pq, the specified "
@@ -2001,7 +2111,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1179
+#: ../dgit.1:1256
msgid ""
"For B<ssh>, the default value is taken from the B<DGIT_SSH> or B<GIT_SSH> "
"environment variables, if set (see below). And, for ssh, when accessing the "
@@ -2013,13 +2123,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1179
+#: ../dgit.1:1256
#, no-wrap
msgid "B<--existing-package=>I<package>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1189
+#: ../dgit.1:1266
msgid ""
"dgit push needs to canonicalise the suite name. Sometimes, dgit lacks a way "
"to ask the archive to do this without knowing the name of an existing "
@@ -2030,19 +2140,19 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1189
+#: ../dgit.1:1266
#, no-wrap
msgid "B<-h>|B<--help>"
msgstr ""
#. type: TP
-#: ../dgit.1:1192
+#: ../dgit.1:1269
#, no-wrap
msgid "B<--initiator-tempdir=>I<directory>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1201
+#: ../dgit.1:1278
msgid ""
"dgit rpush uses a temporary directory on the invoking (signing) host. This "
"option causes dgit to use I<directory> instead. Furthermore, the specified "
@@ -2052,13 +2162,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1201
+#: ../dgit.1:1278
#, no-wrap
msgid "B<--force->I<something>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1209
+#: ../dgit.1:1286
msgid ""
"Instructs dgit to try to proceed despite detecting what it thinks is going "
"to be a fatal problem. B<This is probably not going to work.> These options "
@@ -2067,13 +2177,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1209
+#: ../dgit.1:1286
#, no-wrap
msgid "B<--force-import-dsc-with-dgit-field>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1216
+#: ../dgit.1:1293
msgid ""
"Tell dgit import-dsc to treat a .dsc with a Dgit field like one without it. "
"The result is a fresh import, discarding the git history that the person who "
@@ -2081,26 +2191,26 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1216
+#: ../dgit.1:1293
#, no-wrap
msgid "B<--force-uploading-binaries>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1221
+#: ../dgit.1:1298
msgid ""
"Carry on and upload binaries even though dgit thinks your distro does not "
"permit that."
msgstr ""
#. type: TP
-#: ../dgit.1:1221
+#: ../dgit.1:1298
#, no-wrap
msgid "B<--force-uploading-source-only>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1227
+#: ../dgit.1:1304
msgid ""
"Carry on and do a source-only upload, without any binaries, even though dgit "
"thinks your distro does not permit that, or does not permit that in this "
@@ -2108,13 +2218,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1227
+#: ../dgit.1:1304
#, no-wrap
msgid "B<--force-unrepresentable>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1234
+#: ../dgit.1:1311
msgid ""
"Carry on even if dgit thinks that your git tree contains changes (relative "
"to your .orig tarballs) which dpkg-source is not able to represent. Your "
@@ -2122,65 +2232,79 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1234
+#: ../dgit.1:1311
#, no-wrap
msgid "B<--force-changes-origs-exactly>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1239
+#: ../dgit.1:1316
msgid ""
"Use the set of .origs specified in your .changes, exactly, without regard to "
"what is in the archive already. The archive may well reject your upload."
msgstr ""
#. type: TP
-#: ../dgit.1:1239
+#: ../dgit.1:1316
#, no-wrap
msgid "B<--force-unsupported-source-format>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1243
+#: ../dgit.1:1320
msgid ""
"Carry on despite dgit not understanding your source package format. dgit "
"will probably mishandle it."
msgstr ""
#. type: TP
-#: ../dgit.1:1243
+#: ../dgit.1:1320
#, no-wrap
msgid "B<--force-dsc-changes-mismatch>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1247
+#: ../dgit.1:1324
msgid ""
"Do not check whether .dsc and .changes match. The archive will probably "
"reject your upload."
msgstr ""
#. type: TP
-#: ../dgit.1:1247
+#: ../dgit.1:1324
#, no-wrap
msgid "B<--force-import-gitapply-absurd> | B<--force-import-gitapply-no-absurd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1253
+#: ../dgit.1:1330
msgid ""
"Force on or off the use of the absurd git-apply emulation when running gbp "
"pq import when importing a package from a .dsc. See Debian bug #841867."
msgstr ""
+#. type: TP
+#: ../dgit.1:1330
+#, no-wrap
+msgid "B<--for-push>"
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.1:1336
+msgid ""
+"Override the dgit-distro.distro.readonly configuration setting, to specify "
+"that we have read/write access and should use the corresponding git and "
+"achive access approach even if the operation is a read-only one."
+msgstr ""
+
#. type: =head1
-#: ../dgit.1:1253 ../dgit-downstream-dsc.7.pod:150
+#: ../dgit.1:1336 ../dgit-downstream-dsc.7.pod:150
#, no-wrap
msgid "CONFIGURATION"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1259
+#: ../dgit.1:1342
msgid ""
"dgit can be configured via the git config system. You may set keys with git-"
"config (either in system-global or per-tree configuration), or provide B<-"
@@ -2188,31 +2312,31 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1261
+#: ../dgit.1:1344
msgid "Settings likely to be useful for an end user include:"
msgstr ""
#. type: TP
-#: ../dgit.1:1261
+#: ../dgit.1:1344
#, no-wrap
msgid "B<dgit.default.build-products-dir>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1267
+#: ../dgit.1:1350
msgid ""
"Specifies where to find the built files to be uploaded, when --build-"
"products-dir is not specified. The default is the parent directory (B<..>)."
msgstr ""
#. type: =item
-#: ../dgit.1:1267 ../dgit-downstream-dsc.7.pod:286
+#: ../dgit.1:1350 ../dgit-downstream-dsc.7.pod:286
#, no-wrap
msgid "B<dgit-suite.>I<suite>B<.distro> I<distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1272
+#: ../dgit.1:1355
msgid ""
"Specifies the distro for a suite. dgit keys off the suite name (which "
"appears in changelogs etc.), and uses that to determine the distro which is "
@@ -2220,66 +2344,66 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1275
+#: ../dgit.1:1358
msgid "I<suite> may be a glob pattern."
msgstr ""
#. type: TP
-#: ../dgit.1:1275
+#: ../dgit.1:1358
#, no-wrap
msgid "B<dgit.default.distro>I< distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1278
+#: ../dgit.1:1361
msgid "The default distro for an unknown suite."
msgstr ""
#. type: TP
-#: ../dgit.1:1278
+#: ../dgit.1:1361
#, no-wrap
msgid "B<dgit.default.default-suite>I< suite>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1281
+#: ../dgit.1:1364
msgid "The default suite (eg for clone)."
msgstr ""
#. type: TP
-#: ../dgit.1:1281
+#: ../dgit.1:1364
#, no-wrap
msgid "B<dgit.default.>*"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1286
+#: ../dgit.1:1369
msgid ""
"for each B<dgit-distro.>I<distro>B<.>*, the default value used if there is "
"no distro-specific setting."
msgstr ""
#. type: TP
-#: ../dgit.1:1286
+#: ../dgit.1:1369
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1290
+#: ../dgit.1:1373
msgid ""
"One of the values for the command line --clean= option; used if --clean is "
"not specified."
msgstr ""
#. type: TP
-#: ../dgit.1:1290
+#: ../dgit.1:1373
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.clean-mode-newer>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1296
+#: ../dgit.1:1379
msgid ""
"Like .clean-mode, but ignored if the value is unknown to this version of "
"dgit. Setting both .clean-mode and .clean-mode-newer is useful to provide a "
@@ -2287,39 +2411,45 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1296
+#: ../dgit.1:1379
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.quilt-mode>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1300
+#: ../dgit.1:1383
msgid ""
"One of the values for the command line --quilt= option; used if --quilt is "
"not specified."
msgstr ""
#. type: TP
-#: ../dgit.1:1300
+#: ../dgit.1:1383
+#, no-wrap
+msgid "B<dgit-distro.>I<distro>B<.split-view>"
+msgstr ""
+
+#. type: TP
+#: ../dgit.1:1385
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rm-old-changes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1304
+#: ../dgit.1:1389
msgid ""
"Boolean, used if neither --rm-old-changes nor --no-rm-old-changes is "
"specified. The default is not to remove."
msgstr ""
#. type: TP
-#: ../dgit.1:1304
+#: ../dgit.1:1389
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.readonly> B<auto>|B<a> | B<true>|B<t>|B<y>|B<1> | B<false>|B<f>|B<n>|B<0>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1311
+#: ../dgit.1:1396
msgid ""
"Whether you have push access to the distro. For Debian, it is OK to use "
"auto, which uses readonly mode if you are not pushing right now; but, "
@@ -2328,52 +2458,52 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1311
+#: ../dgit.1:1396
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.keyid>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1315
+#: ../dgit.1:1400
msgid "See also B<-k>."
msgstr ""
#. type: TP
-#: ../dgit.1:1315
+#: ../dgit.1:1400
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.mirror>I< url>"
msgstr ""
#. type: TP
-#: ../dgit.1:1317
+#: ../dgit.1:1402
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.username>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1320
+#: ../dgit.1:1405
msgid "Not relevant for Debian."
msgstr ""
#. type: =item
-#: ../dgit.1:1320 ../dgit-downstream-dsc.7.pod:242
+#: ../dgit.1:1405 ../dgit-downstream-dsc.7.pod:242
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.upload-host>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1323
+#: ../dgit.1:1408
msgid "Might be useful if you have an intermediate queue server."
msgstr ""
#. type: TP
-#: ../dgit.1:1323
+#: ../dgit.1:1408
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.user-name>I< >B<dgit-distro.>I<distro>B<.user-email>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1328
+#: ../dgit.1:1413
msgid ""
"Values to configure for user.name and user.email in new git trees. If not "
"specified, the DEBFULLNAME and DEBEMAIL environment variables are used, "
@@ -2381,26 +2511,26 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1328
+#: ../dgit.1:1413
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-useremail>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1332
+#: ../dgit.1:1417
msgid ""
"Whether to set user.name and user.email in new git trees. True by default. "
"Ignored for dgit setup-useremail, which does it anyway."
msgstr ""
#. type: TP
-#: ../dgit.1:1332
+#: ../dgit.1:1417
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-mergechangelogs>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1337
+#: ../dgit.1:1422
msgid ""
"Whether to set up a merge driver which uses dpkg-mergechangelogs for debian/"
"changelog. True by default. Ignored for dgit setup-mergechangelogs, which "
@@ -2408,13 +2538,13 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1337
+#: ../dgit.1:1422
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.setup-gitattributes>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1343
+#: ../dgit.1:1428
msgid ""
"Whether to configure .git/info/attributes to suppress checkin/checkout file "
"content transformations in new git trees. True by default. Ignored for "
@@ -2422,24 +2552,24 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1343
+#: ../dgit.1:1428
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.cmd->I<cmd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1349
+#: ../dgit.1:1434
msgid "Program to use instead of I<cmd>. Works like B<-->I<cmd>B<=>... ."
msgstr ""
#. type: TP
-#: ../dgit.1:1349
+#: ../dgit.1:1434
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.opts->I<cmd>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1361
+#: ../dgit.1:1446
msgid ""
"Extra options to pass to I<cmd>. Works like B<-->I<cmd>B<:>... . To pass "
"several options, configure multiple values in git config (with git config --"
@@ -2449,13 +2579,13 @@ msgid ""
msgstr ""
#. type: SH
-#: ../dgit.1:1361
+#: ../dgit.1:1446
#, no-wrap
msgid "ACCESS CONFIGURATION"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1366
+#: ../dgit.1:1451
msgid ""
"There are many other settings which specify how a particular distro's "
"services (archive and git) are provided. These should not normally be "
@@ -2464,204 +2594,204 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1366
+#: ../dgit.1:1451
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.nominal-distro>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1369
+#: ../dgit.1:1454
msgid "Shown in git tags, Dgit fields, and so on."
msgstr ""
#. type: TP
-#: ../dgit.1:1369
+#: ../dgit.1:1454
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.alias-canon>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1372
+#: ../dgit.1:1457
msgid "Used for all access configuration lookup."
msgstr ""
#. type: TP
-#: ../dgit.1:1372
+#: ../dgit.1:1457
#, no-wrap
msgid "B<dgit-distro.>I<distro>B</push.>*"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1378
+#: ../dgit.1:1463
msgid ""
"If set, overrides corresponding non B</push> config when B<readonly=false>, "
"or when pushing and B<readonly=auto>."
msgstr ""
#. type: TP
-#: ../dgit.1:1378
+#: ../dgit.1:1463
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>"
msgstr ""
#. type: TP
-#: ../dgit.1:1380
+#: ../dgit.1:1465
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-url>[B<-suffix>]"
msgstr ""
#. type: TP
-#: ../dgit.1:1382
+#: ../dgit.1:1467
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-proto>"
msgstr ""
#. type: TP
-#: ../dgit.1:1384
+#: ../dgit.1:1469
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-path>"
msgstr ""
#. type: TP
-#: ../dgit.1:1386
+#: ../dgit.1:1471
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-check> B<true>|B<false>|B<url>|B<ssh-cmd>"
msgstr ""
#. type: TP
-#: ../dgit.1:1388
+#: ../dgit.1:1473
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-check-suffix>"
msgstr ""
#. type: TP
-#: ../dgit.1:1390
+#: ../dgit.1:1475
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.diverts.divert> B<new-distro>|B</>I<distro-suffix>"
msgstr ""
#. type: TP
-#: ../dgit.1:1392
+#: ../dgit.1:1477
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.git-create>I< >B<ssh-cmd>I<|>B<true>"
msgstr ""
#. type: TP
-#: ../dgit.1:1394
+#: ../dgit.1:1479
#, no-wrap
-msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>"
+msgid "B<dgit-distro.>I<distro>B<.archive-query> B<ftpmasterapi:> | B<madison:>I<distro> | B<dummycat:>I</path> | B<sshpsql:>I<user>B<@>I<host>B<:>I<dbname>B< >|B< aptget:>"
msgstr ""
#. type: TP
-#: ../dgit.1:1396
+#: ../dgit.1:1481
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query->(B<url>|B<tls-key>|B<curl-ca-args>)"
msgstr ""
#. type: TP
-#: ../dgit.1:1398
+#: ../dgit.1:1483
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.madison-distro>"
msgstr ""
#. type: TP
-#: ../dgit.1:1400
+#: ../dgit.1:1485
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.archive-query-default-component>"
msgstr ""
#. type: TP
-#: ../dgit.1:1402
+#: ../dgit.1:1487
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.dgit-tag-format>"
msgstr ""
#. type: TP
-#: ../dgit.1:1404
+#: ../dgit.1:1489
#, no-wrap
-msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>|B<always>"
+msgid "B<dgit-distro.>I<distro>B<.dep14tag> B<want>|B<no>[|B<always>]"
msgstr ""
#. type: TP
-#: ../dgit.1:1406
+#: ../dgit.1:1491
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.ssh>"
msgstr ""
#. type: TP
-#: ../dgit.1:1408
+#: ../dgit.1:1493
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.sshpsql-dbname>"
msgstr ""
#. type: TP
-#: ../dgit.1:1410
+#: ../dgit.1:1495
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.>(B<git>|B<sshpsql>)B<->(B<user>|B<host>|B<user-force>)"
msgstr ""
#. type: TP
-#: ../dgit.1:1412
+#: ../dgit.1:1497
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.backports-quirk>"
msgstr ""
#. type: TP
-#: ../dgit.1:1414
+#: ../dgit.1:1499
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.rewrite-map-enable>"
msgstr ""
#. type: TP
-#: ../dgit.1:1416
+#: ../dgit.1:1501
#, no-wrap
msgid "B<dgit-distro.>I<distro>B<.source-only-uploads> B<ok>|B<always>|B<never>|B<not-wholly-new>"
msgstr ""
#. type: TP
-#: ../dgit.1:1418
+#: ../dgit.1:1503
#, no-wrap
msgid "B<dgit.default.old-dsc-distro>"
msgstr ""
#. type: TP
-#: ../dgit.1:1420
+#: ../dgit.1:1505
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.>I<protocol>"
msgstr ""
#. type: TP
-#: ../dgit.1:1422
+#: ../dgit.1:1507
#, no-wrap
msgid "B<dgit.dsc-url-proto-ok.bad-syntax>"
msgstr ""
#. type: TP
-#: ../dgit.1:1424
+#: ../dgit.1:1509
#, no-wrap
msgid "B<dgit.default.dsc-url-proto-ok>"
msgstr ""
#. type: TP
-#: ../dgit.1:1426
+#: ../dgit.1:1511
#, no-wrap
msgid "B<dgit.vcs-git.suites> I<suite>[B<;>...]"
msgstr ""
#. type: SH
-#: ../dgit.1:1428
+#: ../dgit.1:1513
#, no-wrap
msgid "ENVIRONMENT VARIABLES"
msgstr ""
#. type: TP
-#: ../dgit.1:1429
+#: ../dgit.1:1514
#, no-wrap
msgid "B<DGIT_SSH>, B<GIT_SSH>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1438
+#: ../dgit.1:1523
msgid ""
"specify an alternative default program (and perhaps arguments) to use "
"instead of ssh. DGIT_SSH is consulted first and may contain arguments; if "
@@ -2671,26 +2801,26 @@ msgid ""
msgstr ""
#. type: TP
-#: ../dgit.1:1438
+#: ../dgit.1:1523
#, no-wrap
msgid "B<DEBEMAIL>, B<DEBFULLNAME>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1442
+#: ../dgit.1:1527
msgid ""
"Default git user.email and user.name for new trees. See B<dgit setup-new-"
"tree>."
msgstr ""
#. type: TP
-#: ../dgit.1:1442
+#: ../dgit.1:1527
#, no-wrap
-msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, B<curl>, B<dput>, B<LWP::UserAgent>"
+msgid "B<gpg>, B<dpkg->..., B<debsign>, B<git>, [B<lib>]B<curl>, B<dput>"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1447
+#: ../dgit.1:1532
msgid ""
"and other subprograms and modules used by dgit are affected by various "
"environment variables. Consult the documentation for those programs for "
@@ -2698,13 +2828,13 @@ msgid ""
msgstr ""
#. type: SH
-#: ../dgit.1:1447
+#: ../dgit.1:1532
#, no-wrap
msgid "BUGS"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1454
+#: ../dgit.1:1539
msgid ""
"There should be a `dgit rebase-prep' command or some such to turn a fast-"
"forwarding branch containing pseudo-merges back into a rebasing patch "
@@ -2712,7 +2842,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1460
+#: ../dgit.1:1545
msgid ""
"If the dgit push fails halfway through, it is not necessarily restartable "
"and idempotent. It would be good to check that the proposed signing key is "
@@ -2720,7 +2850,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1465
+#: ../dgit.1:1550
msgid ""
"dgit's build functions, and dgit push, may make changes to your current "
"HEAD. Sadly this is necessary for packages in the `3.0 (quilt)' source "
@@ -2729,7 +2859,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.1:1470
+#: ../dgit.1:1555
msgid ""
"--dry-run does not always work properly, as not doing some of the git "
"fetches may result in subsequent actions being different. Doing a non-dry-"
@@ -2737,24 +2867,25 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1555 ../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:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
+#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:254
#, no-wrap
msgid "SEE ALSO"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1479
+#: ../dgit.1:1564
msgid ""
"B<dgit>(7), B<dgit-*>(7), B<curl>(1), B<dput>(1), B<debsign>(1), B<git-"
"config>(1), B<git-buildpackage>(1), B<dpkg-buildpackage>(1),"
msgstr ""
#. type: Plain text
-#: ../dgit.1:1480
+#: ../dgit.1:1565
msgid "https://browse.dgit.debian.org/"
msgstr ""
diff --git a/po4a/dgit_7.pot b/po4a/dgit_7.pot
index 1329e77..f41a2b8 100644
--- a/po4a/dgit_7.pot
+++ b/po4a/dgit_7.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-07-21 01:37+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"
@@ -33,18 +33,20 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1549 ../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:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
+#: ../git-debrebase.1.pod:619 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:223
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -642,7 +644,7 @@ msgstr ""
#. type: SH
#: ../dgit.7:396
#, no-wrap
-msgid "SPLIT VIEW QUILT MODE"
+msgid "SPLIT VIEW AND SPLITTING QUILT MODES"
msgstr ""
#. type: Plain text
@@ -656,51 +658,61 @@ msgstr ""
#. type: Plain text
#: ../dgit.7:410
msgid ""
-"When a split view mode is engaged dgit build commands and dgit push will, on "
-"each invocation, convert the user's HEAD into the dgit view, so that it can "
-"be built and/or uploaded."
+"When a splitting quilt mode is selected dgit build commands and dgit push "
+"will, on each invocation, convert the user's HEAD into the dgit view, so "
+"that it can be built and/or uploaded."
msgstr ""
#. type: Plain text
-#: ../dgit.7:417
+#: ../dgit.7:416
msgid ""
-"dgit push in split view mode will push the dgit view to the dgit git "
-"server. The dgit view is always a descendant of the maintainer view. dgit "
-"push will also make a maintainer view tag according to DEP-14 and push that "
-"to the dgit git server."
+"Split view mode can also be enabled explicitly with the --split-view command "
+"line option and the .split-view access configuration key."
msgstr ""
#. type: Plain text
-#: ../dgit.7:425
+#: ../dgit.7:429
msgid ""
-"Split view mode must be enabled explicitly (by the use of the applicable "
-"command line options, subcommands, or configuration). This is because it is "
-"not possible to reliably tell (for example) whether a git tree for a dpkg-"
-"source `3.0 (quilt)' package is a patches-applied or patches-unapplied tree."
+"When split view is in operation, regardless of the quilt mode, any dgit-"
+"generated pseudomerges and any quilt fixup commits will appear only in the "
+"dgit view. dgit push will push the dgit view to the dgit git server. The "
+"dgit view is always a descendant of the maintainer view. dgit push will "
+"also make a maintainer view tag according to DEP-14 and push that to the "
+"dgit git server."
msgstr ""
#. type: Plain text
-#: ../dgit.7:429
+#: ../dgit.7:437
+msgid ""
+"Splitting quilt modes must be enabled explicitly (by the use of the "
+"applicable command line options, subcommands, or configuration). This is "
+"because it is not possible to reliably tell (for example) whether a git "
+"tree for a dpkg-source `3.0 (quilt)' package is a patches-applied or patches-"
+"unapplied tree."
+msgstr ""
+
+#. type: Plain text
+#: ../dgit.7:441
msgid ""
"Split view conversions are cached in the ref dgit-intern/quilt-cache. This "
"should not be manipulated directly."
msgstr ""
#. type: SH
-#: ../dgit.7:429
+#: ../dgit.7:441
#, no-wrap
msgid "FILES IN THE ORIG TARBALL BUT NOT IN GIT - AUTOTOOLS ETC."
msgstr ""
#. type: Plain text
-#: ../dgit.7:432
+#: ../dgit.7:444
msgid ""
"This section is mainly of interest to maintainers who want to use dgit with "
"their existing git history for the Debian package."
msgstr ""
#. type: Plain text
-#: ../dgit.7:438
+#: ../dgit.7:450
msgid ""
"Some developers like to have an extra-clean git tree which lacks files which "
"are normally found in source tarballs and therefore in Debian source "
@@ -710,7 +722,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:443
+#: ../dgit.7:455
msgid ""
"dgit requires that the source package unpacks to exactly the same files as "
"are in the git commit on which dgit push operates. So if you just try to "
@@ -718,18 +730,18 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:445
+#: ../dgit.7:457
msgid "As the maintainer you therefore have the following options:"
msgstr ""
#. type: TP
-#: ../dgit.7:445 ../dgit.7:456 ../dgit.7:505 ../dgit.7:513
+#: ../dgit.7:457 ../dgit.7:468 ../dgit.7:517 ../dgit.7:525
#, no-wrap
msgid "\\(bu"
msgstr ""
#. type: Plain text
-#: ../dgit.7:456
+#: ../dgit.7:468
msgid ""
"Delete the files from your git branches, and your Debian source packages, "
"and carry the deletion as a delta from upstream. (With `3.0 (quilt)' this "
@@ -740,7 +752,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:462
+#: ../dgit.7:474
msgid ""
"Persuade upstream that the source code in their git history and the source "
"they ship as tarballs should be identical. Of course simply removing the "
@@ -748,7 +760,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:468
+#: ../dgit.7:480
msgid ""
"One answer is to commit the (maybe autogenerated) files, perhaps with some "
"simple automation to deal with conflicts and spurious changes. This has the "
@@ -757,7 +769,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:473
+#: ../dgit.7:485
msgid ""
"Of course it may also be that the differences are due to build system bugs, "
"which cause unintended files to end up in the source package. dgit will "
@@ -766,13 +778,13 @@ msgid ""
msgstr ""
#. type: SH
-#: ../dgit.7:474
+#: ../dgit.7:486
#, no-wrap
msgid "FILES IN THE SOURCE PACKAGE BUT NOT IN GIT - DOCS, BINARIES ETC."
msgstr ""
#. type: Plain text
-#: ../dgit.7:478
+#: ../dgit.7:490
msgid ""
"Some upstream tarballs contain build artifacts which upstream expects some "
"users not to want to rebuild (or indeed to find hard to rebuild), but which "
@@ -780,7 +792,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:488
+#: ../dgit.7:500
msgid ""
"Examples sometimes include crossbuild firmware binaries and documentation. "
"To avoid problems when building updated source packages (in particular, to "
@@ -790,7 +802,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:496
+#: ../dgit.7:508
msgid ""
"dpkg-source does not (with any of the commonly used source formats) "
"represent deletion of binaries (outside debian/) present in upstream. Thus "
@@ -800,7 +812,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:502
+#: ../dgit.7:514
msgid ""
"However, git does always properly record file deletion. Since dgit's "
"principle is that the dgit git tree is the same of dpkg-source -x, that "
@@ -808,14 +820,14 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:505
+#: ../dgit.7:517
msgid ""
"For the non-maintainer, this can be observed in the following suboptimal "
"occurrences:"
msgstr ""
#. type: Plain text
-#: ../dgit.7:513
+#: ../dgit.7:525
msgid ""
"The package clean target often deletes these files, making the git tree "
"dirty trying to build the source package, etc. This can be fixed by using "
@@ -824,7 +836,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:520
+#: ../dgit.7:532
msgid ""
"The package build modifies these files, so that builds make the git tree "
"dirty. This can be worked around by using `git reset --hard' after each "
@@ -832,7 +844,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:530
+#: ../dgit.7:542
msgid ""
"From the maintainer's point of view, the main consequence is that to make a "
"dgit-compatible git branch it is necessary to commit these files to git. "
@@ -843,13 +855,13 @@ msgid ""
msgstr ""
#. type: SH
-#: ../dgit.7:530
+#: ../dgit.7:542
#, no-wrap
msgid "PROBLEMS WITH PACKAGE CLEAN TARGETS ETC."
msgstr ""
#. type: Plain text
-#: ../dgit.7:538
+#: ../dgit.7:550
msgid ""
"A related problem is other unexpected behaviour by a package's B<clean> "
"target. If a package's rules modify files which are distributed in the "
@@ -858,7 +870,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:546
+#: ../dgit.7:558
msgid ""
"Again, the solution is to use B<dgit -wg> aka B<--clean=git>, which "
"instructs dgit to use git clean instead of the package's build target, along "
@@ -866,7 +878,7 @@ msgid ""
msgstr ""
#. type: Plain text
-#: ../dgit.7:550
+#: ../dgit.7:562
msgid ""
"This is 100% reliable, but has the downside that if you forget to git add or "
"to commit, and then use B<dgit -wg> or B<git reset --hard>, your changes may "
diff --git a/po4a/git-debrebase_1.pot b/po4a/git-debrebase_1.pot
index 0697082..af63d4e 100644
--- a/po4a/git-debrebase_1.pot
+++ b/po4a/git-debrebase_1.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-08-10 19:42+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"
@@ -21,39 +21,34 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
-#: ../dgit.1:496 ../git-debrebase.1.pod:462
+#: ../dgit.1:496 ../git-debrebase.1.pod:476
#, no-wrap
msgid "OPTIONS"
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1555 ../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:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
+#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:254
#, 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
-#: ../git-debrebase.1.pod:10 ../git-debrebase.5.pod:5
-msgid "INTRODUCTION"
-msgstr ""
-
#. type: textblock
#: ../git-debrebase.1.pod:3
-msgid "git-debrebase - delta queue rebase tool for Debian packaging"
+msgid ""
+"git-debrebase - tool to maintain series of Debian changes to upstream source"
msgstr ""
#. type: =head1
@@ -70,59 +65,95 @@ msgid ""
"\n"
msgstr ""
+#. type: =head1
+#: ../git-debrebase.1.pod:10
+msgid "QUICK REFERENCE"
+msgstr ""
+
#. type: textblock
-#: ../git-debrebase.1.pod:12 ../git-debrebase.5.pod:7
+#: ../git-debrebase.1.pod:12
+msgid "These are most of the commands you will regularly need:"
+msgstr ""
+
+#. type: verbatim
+#: ../git-debrebase.1.pod:14
+#, no-wrap
msgid ""
-"git-debrebase is a tool for representing in git, and manpulating, Debian "
-"packages based on upstream source code."
+" git debrebase -i # edit the patch queue\n"
+" git debrebase conclude && git push # push to eg salsa\n"
+" git debrebase conclude && dgit push-source # source-only upload\n"
+" git debrebase [-i] new-upstream 1.2.3-1 # uses tag, eg \"v1.2.3\"\n"
+" dpkg-buildpackage -uc -b # get test debs, at any time\n"
+"\n"
+msgstr ""
+
+#. type: textblock
+#: ../git-debrebase.1.pod:20
+msgid ""
+"To add patches, or edit the packaging, just make git commits. Ignore "
+"anything that may appear in debian/patches. Avoid using \"git pull\" and "
+"\"git merge\" without \"--ff-only\"."
+msgstr ""
+
+#. type: textblock
+#: ../git-debrebase.1.pod:24
+msgid ""
+"git-debrebase has a special branch format, so see \"CONVERTING AN EXISTING "
+"PACKAGE\" in L<dgit-maint-debrebase(7)>."
+msgstr ""
+
+#. type: =head1
+#: ../git-debrebase.1.pod:27
+msgid "GUIDE TO DOCUMENTATION"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:16
+#: ../git-debrebase.1.pod:29
msgid ""
-"This is the command line reference. Please read the tutorial L<dgit-maint-"
-"debrebase(7)>. For background, theory of operation, and definitions see "
+"This is the command line reference. There is also a detailed workflow "
+"tutorial at L<dgit-maint-debrebase(7)> (on which the above \"QUICK REFERENCE"
+"\" is based). For background, theory of operation, and definitions see "
"L<git-debrebase(5)>."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:22
+#: ../git-debrebase.1.pod:36
msgid ""
"You should read this manpage in conjunction with L<git-debrebase(5)/"
"TERMINOLOGY>, which defines many important terms used here."
msgstr ""
#. type: =head1
-#: ../git-debrebase.1.pod:26
+#: ../git-debrebase.1.pod:40
msgid "PRINCIPAL OPERATIONS"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:30
+#: ../git-debrebase.1.pod:44
msgid "git-debrebase [-- <git-rebase options...>]"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:32
+#: ../git-debrebase.1.pod:46
msgid "git-debrebase [-i <further git-rebase options...>]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:34
+#: ../git-debrebase.1.pod:48
msgid ""
"Unstitches and launders the branch. (See L</UNSTITCHING AND LAUNDERING> "
"below.)"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:37
+#: ../git-debrebase.1.pod:51
msgid ""
"Then, if any git-rebase options were supplied, edits the Debian delta queue, "
"using git-rebase, by running"
msgstr ""
#. type: verbatim
-#: ../git-debrebase.1.pod:41
+#: ../git-debrebase.1.pod:55
#, no-wrap
msgid ""
" git rebase <git-rebase options> <breakwater-tip>\n"
@@ -130,7 +161,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:43
+#: ../git-debrebase.1.pod:57
msgid ""
"Do not pass a base branch argument: git-debrebase will supply that. Do not "
"use --onto, or --fork-point. Useful git-rebase options include -i and --"
@@ -138,7 +169,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:48
+#: ../git-debrebase.1.pod:62
msgid ""
"If git-rebase stops for any reason, you may git-rebase --abort, --continue, "
"or --skip, as usual. If you abort the git-rebase, the branch will still "
@@ -146,14 +177,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:54
+#: ../git-debrebase.1.pod:68
msgid ""
"The options for git-rebase must either start with C<-i>, or be prececded by "
"C<-->, to distinguish them from options for git-debrebase."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:58
+#: ../git-debrebase.1.pod:72
msgid ""
"It is hazardous to use plain git-rebase on a git-debrebase branch, because "
"git-rebase has a tendency to start the rebase too far back in history, and "
@@ -161,19 +192,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:64
+#: ../git-debrebase.1.pod:78
msgid "git-debrebase status"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:66
+#: ../git-debrebase.1.pod:80
msgid ""
"Analyses the current branch, both in terms of its contents, and the refs "
"which are relevant to git-debrebase, and prints a human-readable summary."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:71
+#: ../git-debrebase.1.pod:85
msgid ""
"Please do not attempt to parse the output; it may be reformatted or "
"reorganised in the future. Instead, use one of the L<UNDERLYING AND "
@@ -181,107 +212,107 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:77
+#: ../git-debrebase.1.pod:91
msgid "git-debrebase conclude"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:79
+#: ../git-debrebase.1.pod:93
msgid ""
"Finishes a git-debrebase session, tidying up the branch and making it fast "
"forward again."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:82
+#: ../git-debrebase.1.pod:96
msgid ""
"Specifically: if the branch is unstitched, launders and restitches it, "
"making a new pseudomerge. Otherwise, it is an error, unless --noop-ok."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:88
+#: ../git-debrebase.1.pod:102
msgid "git-debrebase quick"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:90
+#: ../git-debrebase.1.pod:104
msgid ""
"Unconditionally launders and restitches the branch, consuming any ffq-prev "
"and making a new pseudomerge."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:94
+#: ../git-debrebase.1.pod:108
msgid "If the branch is already laundered and stitched, does nothing."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:96
+#: ../git-debrebase.1.pod:110
msgid "git-debrebase prepush [--prose=<for commit message>]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:98
+#: ../git-debrebase.1.pod:112
msgid "If the branch is unstitched, stitches it, consuming ffq-prev."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:102
+#: ../git-debrebase.1.pod:116
msgid ""
"This is a good command to run before pushing to a git server. You should "
"consider using B<conclude> instead, because that launders the branch too."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:106
+#: ../git-debrebase.1.pod:120
msgid "git-debrebase stitch [--prose=<for commit message>]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:108
+#: ../git-debrebase.1.pod:122
msgid "Stitches the branch, consuming ffq-prev."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:111
+#: ../git-debrebase.1.pod:125
msgid "If there is no ffq-prev, it is an error, unless --noop-ok."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:113
+#: ../git-debrebase.1.pod:127
msgid "You should consider using B<prepush> or B<conclude> instead."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:115
+#: ../git-debrebase.1.pod:129
msgid "git-debrebase scrap"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:117
+#: ../git-debrebase.1.pod:131
msgid ""
"Throws away all the work since the branch was last stitched. This is done "
"by rewinding you to ffq-prev."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:120
+#: ../git-debrebase.1.pod:134
msgid "If you are in the middle of a git-rebase, will abort that too."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:122
+#: ../git-debrebase.1.pod:136
msgid "git-debrebase new-upstream <new-version> [<upstream-details>...]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:124
+#: ../git-debrebase.1.pod:138
msgid "Rebases the delta queue onto a new upstream version. In detail:"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:127
+#: ../git-debrebase.1.pod:141
msgid ""
"Firstly, checks that the proposed rebase seems to make sense: It is a snag "
"unless the new upstream(s) are fast forward from the previous upstream(s) "
@@ -291,12 +322,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:135
+#: ../git-debrebase.1.pod:149
msgid "If all seems well, unstitches and launders the branch."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:137
+#: ../git-debrebase.1.pod:151
msgid ""
"Then, generates (in a private working area) a new anchor merge commit, on "
"top of the breakwater tip, and on top of that a commit to update the version "
@@ -304,26 +335,26 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:145
+#: ../git-debrebase.1.pod:159
msgid "Finally, starts a git-rebase of the delta queue onto these new commits."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:149
+#: ../git-debrebase.1.pod:163
msgid ""
"That git-rebase may complete successfully, or it may require your "
"assistance, just like a normal git-rebase."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:153
+#: ../git-debrebase.1.pod:167
msgid ""
"If you git-rebase --abort, the whole new upstream operation is aborted, "
"except for the laundering."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:157
+#: ../git-debrebase.1.pod:171
msgid ""
"<new-version> may be a whole new Debian version, including revision, or just "
"the upstream part, in which case -1 will be appended to make the new Debian "
@@ -331,17 +362,17 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:163
+#: ../git-debrebase.1.pod:177
msgid "The <upstream-details> are, optionally, in order:"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:167
+#: ../git-debrebase.1.pod:181
msgid "<upstream-commit-ish>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:169
+#: ../git-debrebase.1.pod:183
msgid ""
"The new upstream branch (or commit-ish). The default is to look for one of "
"these tags, in this order: U vU upstream/U; where U is the new upstream "
@@ -349,7 +380,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:175
+#: ../git-debrebase.1.pod:189
msgid ""
"It is a snag if the upstream contains a debian/ directory; if forced to "
"proceed, git-debrebase will disregard the upstream's debian/ and take (only) "
@@ -357,17 +388,17 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:180
+#: ../git-debrebase.1.pod:194
msgid "<piece-name> <piece-upstream-commit-ish>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:182
+#: ../git-debrebase.1.pod:196
msgid "Specifies that this is a multi-piece upstream. May be repeated."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:185
+#: ../git-debrebase.1.pod:199
msgid ""
"When such a pair is specified, git-debrebase will first combine the pieces "
"of the upstream together, and then use the result as the combined new "
@@ -375,7 +406,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:190
+#: ../git-debrebase.1.pod:204
msgid ""
"For each <piece-name>, the tree of the <piece-upstream-commit-ish> becomes "
"the subdirectory <piece-name> in the combined new upstream (supplanting any "
@@ -383,14 +414,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:197
+#: ../git-debrebase.1.pod:211
msgid ""
"<piece-name> has a restricted syntax: it may contain only ASCII "
"alphanumerics and hyphens."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:200
+#: ../git-debrebase.1.pod:214
msgid ""
"The combined upstream is itself recorded as a commit, with each of the "
"upstream pieces' commits as parents. The combined commit contains an "
@@ -399,24 +430,24 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:206
+#: ../git-debrebase.1.pod:220
msgid "<git-rebase options>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:208
+#: ../git-debrebase.1.pod:222
msgid "These will be passed to git rebase."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:210
+#: ../git-debrebase.1.pod:224
msgid ""
"If the upstream rebase is troublesome, -i may be helpful. As with plain git-"
"debrebase, do not specify a base, or --onto, or --fork-point."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:216
+#: ../git-debrebase.1.pod:230
msgid ""
"If you are planning to generate a .dsc, you will also need to have, or "
"generate, actual orig tarball(s), which must be identical to the rev-"
@@ -427,19 +458,19 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:227
+#: ../git-debrebase.1.pod:241
msgid "git-debrebase make-patches [--quiet-would-amend]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:229
+#: ../git-debrebase.1.pod:243
msgid ""
"Generate patches in debian/patches/ representing the changes made to "
"upstream files."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:232
+#: ../git-debrebase.1.pod:246
msgid ""
"It is not normally necessary to run this command explicitly. When uploading "
"to Debian, dgit and git-debrebase will cooperate to regenerate patches as "
@@ -447,7 +478,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:239
+#: ../git-debrebase.1.pod:253
msgid ""
"Normally git-debrebase make-patches will require a laundered branch. (A "
"laundered branch does not contain any patches.) But if there are already "
@@ -457,7 +488,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:248
+#: ../git-debrebase.1.pod:262
msgid ""
"If the patches implied by the current branch are not a simple superset of "
"those already in debian/patches, make-patches will fail with exit status 7, "
@@ -467,53 +498,53 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:257
+#: ../git-debrebase.1.pod:271
msgid "git-debrebase convert-from-unapplied [<upstream-commit-ish>]"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:259
+#: ../git-debrebase.1.pod:273
msgid "git-debrebase convert-from-gbp [<upstream-commit-ish>]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:261
+#: ../git-debrebase.1.pod:275
msgid "Converts any of the following into a git-debrebase interchange branch:"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:267
+#: ../git-debrebase.1.pod:281
msgid "a gbp patches-unapplied branch (but not a gbp pq patch-queue branch)"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:271
+#: ../git-debrebase.1.pod:285
msgid ""
"a patches-unapplied git packaging branch containing debian/patches, as used "
"with quilt"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:276
+#: ../git-debrebase.1.pod:290
msgid ""
"a git branch for a package which has no Debian delta - ie where upstream "
"files are have not been modified in Debian, so there are no patches"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:282
+#: ../git-debrebase.1.pod:296
msgid "(These two commands operate identically and are simply aliases.)"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:284
+#: ../git-debrebase.1.pod:298
msgid ""
"The conversion is done by generating a new anchor merge, converting any "
"quilt patches as a delta queue, and dropping the patches from the tree."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:288
+#: ../git-debrebase.1.pod:302
msgid ""
"The upstream commit-ish should correspond to the upstream branch or tag, if "
"there is one. It is a snag if it is not an ancestor of HEAD, or if the "
@@ -523,7 +554,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:296
+#: ../git-debrebase.1.pod:310
msgid ""
"It is also a snag if the specified upstream has a debian/ subdirectory. "
"This check exists to detect certain likely user errors, but if this "
@@ -531,7 +562,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:302
+#: ../git-debrebase.1.pod:316
msgid ""
"git-debrebase will try to look for the dgit archive view of the most recent "
"release, and if it finds it will make a pseduomerge so that your new git-"
@@ -539,14 +570,14 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:307
+#: ../git-debrebase.1.pod:321
msgid ""
"The result is a well-formed git-debrebase interchange branch. The result is "
"also fast-forward from the original branch."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:310
+#: ../git-debrebase.1.pod:324
msgid ""
"It is a snag if the new branch looks like it will have diverged, just as for "
"a laundering/unstitching call to git-debrebase; See L</Establish the current "
@@ -554,7 +585,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:314
+#: ../git-debrebase.1.pod:328
msgid ""
"Note that it is dangerous not to know whether you are dealing with a (gbp) "
"patches-unapplied branch containing quilt patches, or a git-debrebase "
@@ -563,39 +594,39 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../git-debrebase.1.pod:323
+#: ../git-debrebase.1.pod:337
msgid "UNDERLYING AND SUPPLEMENTARY OPERATIONS"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:327
+#: ../git-debrebase.1.pod:341
msgid "git-debrebase breakwater"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:329
+#: ../git-debrebase.1.pod:343
msgid ""
"Prints the breakwater tip commitid. If your HEAD branch is not fully "
"laundered, prints the tip of the so-far-laundered breakwater."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:333
+#: ../git-debrebase.1.pod:347
msgid "git-debrebase anchor"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:335
+#: ../git-debrebase.1.pod:349
msgid "Prints the breakwater anchor commitid."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:337
+#: ../git-debrebase.1.pod:351
msgid "git-debrebase analyse"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:339
+#: ../git-debrebase.1.pod:353
msgid ""
"Walks the history of the current branch, most recent commit first, back "
"until the most recent anchor, printing the commit object id, and commit type "
@@ -603,31 +634,31 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:347
+#: ../git-debrebase.1.pod:361
msgid "git-debrebase record-ffq-prev"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:349
+#: ../git-debrebase.1.pod:363
msgid ""
"Establishes the current branch's ffq-prev, as discussed in L</UNSTITCHING "
"AND LAUNDERING>, but does not launder the branch or move HEAD."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:353
+#: ../git-debrebase.1.pod:367
msgid ""
"It is an error if the ffq-prev could not be recorded. It is also an error "
"if an ffq-prev has already been recorded, unless --noop-ok."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:357
+#: ../git-debrebase.1.pod:371
msgid "git-debrebase launder-v0"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:359
+#: ../git-debrebase.1.pod:373
msgid ""
"Launders the branch without recording anything in ffq-prev. Then prints "
"some information about the current branch. Do not use this operation; it "
@@ -635,12 +666,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:364
+#: ../git-debrebase.1.pod:378
msgid "git-debrebase convert-to-gbp"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:366
+#: ../git-debrebase.1.pod:380
msgid ""
"Converts a laundered branch into a gbp patches-unapplied branch containing "
"quilt patches. The result is not fast forward from the interchange branch, "
@@ -648,7 +679,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:371
+#: ../git-debrebase.1.pod:385
msgid ""
"This is provided mostly for the test suite and for unusual situations. It "
"should only be used with care and with a proper understanding of the "
@@ -656,19 +687,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:376
+#: ../git-debrebase.1.pod:390
msgid ""
"Be sure to not accidentally treat the result as a git-debrebase branch, or "
"you will drop all the patches!"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:380
+#: ../git-debrebase.1.pod:394
msgid "git-debrebase convert-from-dgit-view [<convert-options>] [upstream]"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:382
+#: ../git-debrebase.1.pod:396
msgid ""
"Converts any dgit-compatible git branch corresponding to a (possibly "
"hypothetical) 3.0 quilt dsc source package into a git-debrebase-compatible "
@@ -676,7 +707,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:386
+#: ../git-debrebase.1.pod:400
msgid ""
"This operation should not be used if the branch is already in git-debrebase "
"form. Normally git-debrebase will refuse to continue in this case (or "
@@ -684,7 +715,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:391
+#: ../git-debrebase.1.pod:405
msgid ""
"Some representation of the original upstream source code will be needed. If "
"I<upstream> is supplied, that must be a suitable upstream commit. By "
@@ -693,7 +724,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:397
+#: ../git-debrebase.1.pod:411
msgid ""
"The upstream source must be exactly right and all the patches in debian/"
"patches must be up to date. Applying the patches from debian/patches to the "
@@ -701,7 +732,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:402
+#: ../git-debrebase.1.pod:416
msgid ""
"The output is laundered and stitched. The resulting history is not "
"particularly pretty, especially if orig tarball(s) were imported to produce "
@@ -709,31 +740,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:407
+#: ../git-debrebase.1.pod:421
msgid ""
"The available convert-options are as follows. (These must come after "
"convert-from-dgit-view.)"
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:412
+#: ../git-debrebase.1.pod:426
msgid "--[no-]diagnose"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:414
+#: ../git-debrebase.1.pod:428
msgid ""
"Print additional error messages to help diagnose failure to find an "
"appropriate upstream. --no-diagnose is the default."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:418
+#: ../git-debrebase.1.pod:432
msgid "--build-products-dir"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:420
+#: ../git-debrebase.1.pod:434
msgid ""
"Directory to look in for orig tarballs. The default is the git config "
"option dgit.default.build-products-dir or failing that, C<..>. Passed on to "
@@ -741,35 +772,35 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:426
+#: ../git-debrebase.1.pod:440
msgid "--[no-]origs"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:428
+#: ../git-debrebase.1.pod:442
msgid ""
"Whether to try to look for or use any orig tarballs. --origs is the default."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:431
+#: ../git-debrebase.1.pod:445
msgid "--[no-]tags"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:433
+#: ../git-debrebase.1.pod:447
msgid ""
"Whether to try to look for or use any upstream git tags. --tags is the "
"default."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:436
+#: ../git-debrebase.1.pod:450
msgid "--always-convert-anyway"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:438
+#: ../git-debrebase.1.pod:452
msgid ""
"Perform the conversion operation, producing unpleasant extra history, even "
"if the branch seems to be in git-debrebase form already. This should not be "
@@ -777,12 +808,12 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:446
+#: ../git-debrebase.1.pod:460
msgid "git-debrebase forget-was-ever-debrebase"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:448
+#: ../git-debrebase.1.pod:462
msgid ""
"Deletes the ffq-prev and debrebase-last refs associated with this branch, "
"that git-debrebase and dgit use to determine whether this branch is managed "
@@ -790,19 +821,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:454
+#: ../git-debrebase.1.pod:468
msgid ""
"This can be useful if you were just playing with git-debrebase, and have "
"used git-reset --hard to go back to a commit before your experiments."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:458
+#: ../git-debrebase.1.pod:472
msgid "Do not use this if you expect to run git-debrebase on the branch again."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:464
+#: ../git-debrebase.1.pod:478
msgid ""
"This section documents the general options to git-debrebase (ie, the ones "
"which immediately follow git-debrebase or git debrebase on the command "
@@ -811,78 +842,78 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:476
+#: ../git-debrebase.1.pod:490
msgid "-f<snag-id>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:478
+#: ../git-debrebase.1.pod:492
msgid "Turns snag(s) with id <snag-id> into warnings."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:480
+#: ../git-debrebase.1.pod:494
msgid ""
"Some troublesome things which git-debrebase encounters are B<snag>s. (The "
"specific instances are discussed in the text for the relevant operation.)"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:485
+#: ../git-debrebase.1.pod:499
msgid ""
"When a snag is detected, a message is printed to stderr containing the snag "
"id (in the form C<-f<snag-idE<gt>>), along with some prose."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:490
+#: ../git-debrebase.1.pod:504
msgid ""
"If snags are detected, git-debrebase does not continue, unless the relevant -"
"f<snag-id> is specified, or --force is specified."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:494
+#: ../git-debrebase.1.pod:508
msgid "--force"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:496
+#: ../git-debrebase.1.pod:510
msgid "Turns all snags into warnings. See the -f<snag-id> option."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:499
+#: ../git-debrebase.1.pod:513
msgid ""
"Do not invoke git-debrebase --force in scripts and aliases; instead, specify "
"the particular -f<snag-id> for expected snags."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:502
+#: ../git-debrebase.1.pod:516
msgid "--noop-ok"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:504
+#: ../git-debrebase.1.pod:518
msgid ""
"Suppresses the error in some situations where git-debrebase does nothing, "
"because there is nothing to do."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:508
+#: ../git-debrebase.1.pod:522
msgid ""
"The specific instances are discussed in the text for the relvant operation."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:511
+#: ../git-debrebase.1.pod:525
msgid "--anchor=<commit-ish>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:513
+#: ../git-debrebase.1.pod:527
msgid ""
"Treats <commit-ish> as an anchor. This overrides the usual logic which "
"automatically classifies commits as anchors, pseudomerges, delta queue "
@@ -890,7 +921,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:517
+#: ../git-debrebase.1.pod:531
msgid ""
"It also disables some coherency checks which depend on metadata extracted "
"from its commit message, so it is a snag if <commit-ish> is the anchor for "
@@ -898,41 +929,41 @@ msgid ""
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:524
+#: ../git-debrebase.1.pod:538
msgid "--dgit=<program>"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:526
+#: ../git-debrebase.1.pod:540
msgid ""
"Run <program>, instead of dgit from PATH, when invocation of dgit is "
"necessary. This is provided mostly for the benefit of the test suite."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:530
+#: ../git-debrebase.1.pod:544
msgid "-D"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:532
+#: ../git-debrebase.1.pod:546
msgid "Requests (more) debugging. May be repeated."
msgstr ""
#. type: =item
-#: ../git-debrebase.1.pod:534
-msgid "--experimntal-merge-resolution"
+#: ../git-debrebase.1.pod:548
+msgid "--experimental-merge-resolution"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:536
+#: ../git-debrebase.1.pod:550
msgid ""
"Enable experimental code for handling general merges (see L<git-debrebase(5)/"
"General merges>)."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:539
+#: ../git-debrebase.1.pod:553
msgid ""
"This option may generate lossage of various kinds, including misleading "
"error messages, references to nonexistent documentation, and you being "
@@ -940,24 +971,24 @@ msgid ""
msgstr ""
#. type: =head1
-#: ../git-debrebase.1.pod:547
+#: ../git-debrebase.1.pod:561
msgid "UNSTITCHING AND LAUNDERING"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:549
+#: ../git-debrebase.1.pod:563
msgid ""
"Several operations unstitch and launder the branch first. In detail this "
"means:"
msgstr ""
#. type: =head2
-#: ../git-debrebase.1.pod:552
+#: ../git-debrebase.1.pod:566
msgid "Establish the current branch's ffq-prev"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:554
+#: ../git-debrebase.1.pod:568
msgid ""
"If ffq-prev is not yet recorded, git-debrebase checks that the current "
"branch is ahead of relevant remote tracking branches. The relevant branches "
@@ -965,30 +996,30 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:566
+#: ../git-debrebase.1.pod:580
msgid ""
"The branch that git would merge from (remote.<branch>.merge, remote.<branch>."
"remote);"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:571
+#: ../git-debrebase.1.pod:585
msgid ""
"The branch git would push to, if different (remote.<branch>.pushRemote etc.);"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:576
+#: ../git-debrebase.1.pod:590
msgid "For local dgit suite branches, the corresponding tracking remote;"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:581
+#: ../git-debrebase.1.pod:595
msgid "If you are on C<master>, remotes/dgit/dgit/sid."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:586
+#: ../git-debrebase.1.pod:600
msgid ""
"The apparently relevant ref names to check are filtered through branch."
"<branch>.ffq-ffrefs, which is a semicolon-separated list of glob patterns, "
@@ -996,7 +1027,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:591
+#: ../git-debrebase.1.pod:605
msgid ""
"In each case it is a snag if the local HEAD is behind the checked remote, or "
"if local HEAD has diverged from it. All the checks are done locally using "
@@ -1005,31 +1036,31 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:597
+#: ../git-debrebase.1.pod:611
msgid ""
"If these checks pass, or are forced, git-debrebse then records the current "
"tip as ffq-prev."
msgstr ""
#. type: =head2
-#: ../git-debrebase.1.pod:601
+#: ../git-debrebase.1.pod:615
msgid "Examine the branch"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:603
+#: ../git-debrebase.1.pod:617
msgid ""
"git-debrebase analyses the current HEAD's history to find the anchor in its "
"breakwater, and the most recent breakwater tip."
msgstr ""
#. type: =head2
-#: ../git-debrebase.1.pod:608
+#: ../git-debrebase.1.pod:622
msgid "Rewrite the commits into laundered form"
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:610
+#: ../git-debrebase.1.pod:624
msgid ""
"Mixed debian+upstream commits are split into two commits each. Delta queue "
"(upstream files) commits bubble to the top. Pseudomerges, and quilt patch "
@@ -1037,13 +1068,13 @@ msgid ""
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:616
+#: ../git-debrebase.1.pod:630
msgid ""
"This rewrite will always succeed, by construction. The result is the "
"laundered branch."
msgstr ""
#. type: textblock
-#: ../git-debrebase.1.pod:621
-msgid "git-debrebase(1), dgit-maint-rebase(7), dgit(1), gitglossary(7)"
+#: ../git-debrebase.1.pod:635
+msgid "git-debrebase(1), dgit-maint-debrebase(7), dgit(1), gitglossary(7)"
msgstr ""
diff --git a/po4a/git-debrebase_5.pot b/po4a/git-debrebase_5.pot
index 71601b1..91ac1c8 100644
--- a/po4a/git-debrebase_5.pot
+++ b/po4a/git-debrebase_5.pot
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2019-03-01 16:59+0000\n"
+"POT-Creation-Date: 2019-08-10 19:42+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"
@@ -21,18 +21,20 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:1 ../git-debrebase.1.pod:1 ../git-debrebase.5.pod:1
+#: ../git-debpush.1.pod:1
#, no-wrap
msgid "NAME"
msgstr ""
#. type: =head1
-#: ../dgit.1:1470 ../dgit.7:23 ../dgit-user.7.pod:447
+#: ../dgit.1:1555 ../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:747 ../dgit-downstream-dsc.7.pod:352
-#: ../dgit-sponsorship.7.pod:321 ../git-debrebase.1.pod:619
-#: ../git-debrebase.5.pod:678
+#: ../dgit-maint-merge.7.pod:521 ../dgit-maint-gbp.7.pod:136
+#: ../dgit-maint-debrebase.7.pod:778 ../dgit-downstream-dsc.7.pod:352
+#: ../dgit-sponsorship.7.pod:321 ../dgit-maint-bpo.7.pod:134
+#: ../git-debrebase.1.pod:633 ../git-debrebase.5.pod:678
+#: ../git-debpush.1.pod:254
#, no-wrap
msgid "SEE ALSO"
msgstr ""
@@ -41,15 +43,13 @@ msgstr ""
#: ../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
+#: ../dgit-maint-bpo.7.pod:5 ../git-debrebase.5.pod:5
msgid "INTRODUCTION"
msgstr ""
-#. 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."
+#. type: =head1
+#: ../dgit-maint-bpo.7.pod:11 ../git-debrebase.5.pod:37
+msgid "TERMINOLOGY"
msgstr ""
#. type: textblock
@@ -58,6 +58,13 @@ msgid "git-debrebase - git data model for Debian packaging"
msgstr ""
#. type: textblock
+#: ../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 ""
+
+#. type: textblock
#: ../git-debrebase.5.pod:11
msgid ""
"The Debian packaging has a fast forwarding history. The delta queue "
@@ -96,11 +103,6 @@ msgid ""
"output than the default."
msgstr ""
-#. type: =head1
-#: ../git-debrebase.5.pod:37
-msgid "TERMINOLOGY"
-msgstr ""
-
#. type: =item
#: ../git-debrebase.5.pod:41
msgid "Pseudomerge"
@@ -620,7 +622,7 @@ msgstr ""
#. type: textblock
#: ../git-debrebase.5.pod:394
msgid ""
-"See dgit-maint-rebase(7) for a discussion of what kinds of behaviours "
+"See dgit-maint-debrebase(7) for a discussion of what kinds of behaviours "
"should be be avoided because they might generate such merges."
msgstr ""
diff --git a/po4a/po4a.cfg b/po4a/po4a.cfg
index 47e8b13..491c3d0 100644
--- a/po4a/po4a.cfg
+++ b/po4a/po4a.cfg
@@ -14,6 +14,7 @@
[type: pod] ../dgit-maint-debrebase.7.pod $lang:translated/man/$lang/man7/dgit-maint-debrebase.7.pod master:file=dgit-maint-debrebase_7
[type: pod] ../dgit-downstream-dsc.7.pod $lang:translated/man/$lang/man7/dgit-downstream-dsc.7.pod master:file=dgit-downstream-dsc_7
[type: pod] ../dgit-sponsorship.7.pod $lang:translated/man/$lang/man7/dgit-sponsorship.7.pod master:file=dgit-sponsorship_7
+[type: pod] ../dgit-maint-bpo.7.pod $lang:translated/man/$lang/man7/dgit-maint-bpo.7.pod master:file=dgit-maint-bpo_7
[type: pod] ../git-debrebase.1.pod $lang:translated/man/$lang/man1/git-debrebase.1.pod master:file=git-debrebase_1
[type: pod] ../git-debrebase.5.pod $lang:translated/man/$lang/man5/git-debrebase.5.pod master:file=git-debrebase_5
[type: pod] ../git-debpush.1.pod $lang:translated/man/$lang/man1/git-debpush.1.pod master:file=git-debpush_1
diff --git a/tests/enumerate-tests b/tests/enumerate-tests
index 8ee34be..680236e 100755
--- a/tests/enumerate-tests
+++ b/tests/enumerate-tests
@@ -45,18 +45,27 @@ test-begin-gencontrol () {
dependencies='dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime'
}
+gencontrol-add-things () {
+ local varname=$1; shift
+ local delim=$1; shift
+ local thing
+ eval '
+ for thing in "$@"; do
+ case " $'$varname$delim '" in
+ *" "$thing"'$delim' "*) continue ;;
+ esac
+ '$varname'+="${'$varname':+'$delim' }$thing"
+ done
+ '
+}
+
restriction-gencontrol () {
if [ $r = x-dgit-out-of-tree-only ]; then return; fi
- restrictions+=" $r"
+ gencontrol-add-things restrictions '' "$r"
}
gencontrol-add-deps () {
- for dep in "$@"; do
- case " $dependencies," in
- *" "$dep","*) continue ;;
- esac
- dependencies+="${dependencies:+, }$dep"
- done
+ gencontrol-add-things dependencies , "$@"
}
dependencies-gencontrol () {
@@ -89,7 +98,7 @@ test-done-gencontrol () {
}
'
case "$restrictions" in
- ?*) echo "Restrictions:$restrictions" ;;
+ ?*) echo "Restrictions: $restrictions" ;;
esac
)
key=$(printf "%s" "$stanza" | sha256sum)
@@ -132,6 +141,10 @@ allsedderies () {
for import in $(seddery 's/^t-setup-import //p'); do
allsedderies tests/setup/$import
done
+ if egrep -q '^t-alt-test *$' <$tf; then
+ local leaf=${tf#tests/tests/}
+ allsedderies tests/tests/"${leaf#*-}"
+ fi
}
for t in $(run-parts --list tests/tests); do
diff --git a/tests/git-srcs/pari-extra_3-1.git.tar b/tests/git-srcs/pari-extra_3-1.git.tar
index 1673c72..6392d83 100644
--- a/tests/git-srcs/pari-extra_3-1.git.tar
+++ b/tests/git-srcs/pari-extra_3-1.git.tar
Binary files differ
diff --git a/tests/http-static-server b/tests/http-static-server
new file mode 100755
index 0000000..f2f7cd0
--- /dev/null
+++ b/tests/http-static-server
@@ -0,0 +1,96 @@
+#!/usr/bin/perl -w
+#
+# This file is part of the dgit test suite.
+#
+# Copyright (C)2004-2015 Best Practical Solutions, LLC
+# Copyright (C)2019 Ian Jackson
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+#
+# invocation protocol:
+#
+# http-static-server >port-file tests/tmp/$thing/aq
+#
+# Will write the allocated port number to port-file.
+# Then we fork and the parent exits 0.
+# If port-file is unlinked, we exit.
+
+use strict;
+use IO::Handle;
+
+our ($webroot) = @ARGV;
+our $port = '';
+
+# HTTP::Server::Simple handles requests in the main process so it
+# must redirect and close STDOUT. So transplant STDOUT to CHECK.
+open CHECK, ">& STDOUT" or die $!;
+open STDOUT, ">/dev/null" or die $!;
+
+sub stat_type_check () {
+ die "[$port, $webroot] stdout not ta plain file"
+ unless -f _;
+}
+
+stat CHECK or die $!;
+stat_type_check();
+
+sub start_polling_fstat () {
+ our $polling_pid = $$;
+ $SIG{ALRM} = sub {
+ return unless $$ = $polling_pid;
+ stat CHECK or die $!;
+ my $nlink = (stat _)[3];
+ exit 0 unless $nlink;
+ stat_type_check(); # doesn't seem possible to fail but check anyway
+ alarm(1);
+ };
+ alarm(1);
+}
+
+package ServerClass;
+
+use strict;
+use Socket qw(AF_INET SOCK_STREAM);
+use Socket qw(AF_INET SOCK_STREAM unpack_sockaddr_in);
+use IO::Handle;
+
+use base qw(HTTP::Server::Simple::CGI);
+use HTTP::Server::Simple::Static;
+
+sub handle_request {
+ my ($self, $cgi) = @_;
+
+ if (!$self->serve_static($cgi, $::webroot)) {
+ print "HTTP/1.0 404 Not found\r\n";
+ print $cgi->header,
+ $cgi->start_html('Not found'),
+ $cgi->h1('Not found'),
+ $cgi->end_html;
+ }
+}
+
+sub port () { return 0; }
+
+sub after_setup_listener () {
+ my $sn = getsockname HTTP::Server::Simple::HTTPDaemon or die $!;
+ ($main::port,) = unpack_sockaddr_in $sn;
+ print main::CHECK $port, "\n" or die $!;
+ flush main::CHECK or die $!;
+ my $c = fork // die $!;
+ exit 0 if $c;
+ ::main::start_polling_fstat();
+}
+
+package main;
+
+our $server = ServerClass->new();
+$server->run();
diff --git a/tests/lib b/tests/lib
index 35dbb1e..8392e79 100644
--- a/tests/lib
+++ b/tests/lib
@@ -22,7 +22,14 @@ END
exit 16
}
-trap 'test $? = 0 || t-report-failure' EXIT
+trap '
+ rc=$?
+ set +e
+ [ "x$DGIT_TEST_KEEP_MUSTCLEAN" != x ] || \
+ [ "x$DGIT_TEST_TMP" = x ] || rm -rf $DGIT_TEST_TMP/must-clean
+ set -e
+ test $rc = 0 || t-report-failure
+' EXIT
t-filter-out-git-hyphen-dir
@@ -74,6 +81,11 @@ export DEBCHANGE_VENDOR=dpkg
unset VISUAL
unset GIT_EDITOR
+mkdir -p $tmp/must-clean
+# must-clean is usually removed after each test, on success or failure.
+# But this must not be relied on for correctness, only for garbage
+# collection etc.
+
mkdir -p $tmp/incoming
cat <<END >$tmp/dput.cf
[test-dummy]
@@ -464,6 +476,19 @@ t-dgit () {
'
}
+t-non-dgit-upload () {
+ t-dgit -wgf build-source
+
+ cd ..
+ c=${p}_${v}_source.changes
+ debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+ dput -c $tmp/dput.cf test-dummy $c
+
+ t-archive-process-incoming sid
+ t-git-next-date
+ cd $p
+}
+
t-dgit-manpage () {
local section=$1
local page=$2
@@ -573,6 +598,8 @@ t-setup-import () {
(set -e; cd $tmp; tar xf "$simport.tar")
fi
+ mkdir -p $tmp/must-clean
+
. "$simport"
}
@@ -777,11 +804,12 @@ t-splitbrain-pushed-good-start () {
t-refs-same-start
t-ref-same refs/heads/split.p
- case "$(t-git-get-ref refs/heads/split.b)" in
+ local split_b=$(t-git-get-ref refs/heads/split.b)
+ case "$split_b" in
"$t_ref_val") ;;
"$(git rev-parse refs/heads/split.p^0)") ;;
"$(git rev-parse refs/heads/split.p^1)") ;;
- *) fail 'bad b/p' ;;
+ *) fail "bad b/p (b=$split_b)" ;;
esac
t-pushed-good-core
@@ -1027,7 +1055,6 @@ t-git-pseudo-merge () {
}
t-gbp-example-prep-no-ff () {
- t-tstunt-parsechangelog
t-archive example 1.0-1
t-git-none
t-worktree 1.0
@@ -1187,7 +1214,7 @@ t-debpolicy () {
t-dsd
t-policy dgit-repos-policy-debian
- mkdir $tmp/git
+ mkdir -p $tmp/git
t-policy-admin create-db
}
@@ -1236,7 +1263,6 @@ t-tagupl-test () {
cd ../$p
t-dgit fetch
- t-pushed-good master
}
t-buildproductsdir-config () {
diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 3ef6569..557c051 100644
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -23,7 +23,7 @@ baredebian-test-minimum () {
t-dgit -wn --dgit-view-save=split.f1 --$quiltmode quilt-fixup
}
-baredebian-test-core () {
+baredebian-test-core-prepush () {
tar --strip-components=1 -axf ../$origbase.tar.*
for comp in $xorigcomps; do
mkdir $comp
@@ -56,14 +56,22 @@ baredebian-test-core () {
git add debian/patches/.
t-commit 'extra patch made with quilt' 1.0-2
+ t-refs-same-start
+ t-ref-head
+ t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup
+ t-ref-head
+}
+
+baredebian-test-core-push () {
dpkg-buildpackage -uc -us --build=source
# ^ Do this by hand here not because we expect users to do this
# (rather than dgit build), but so that we can check that our
# output is the same as users are used to.
- t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup
t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.p --new push
+}
+baredebian-test-core-postpush () {
git merge-base --is-ancestor HEAD split.p
if [ "$uvtag" ]; then
git merge-base --is-ancestor $uvtag split.p
@@ -86,6 +94,12 @@ baredebian-test-core () {
t-splitbrain-pushed-good-end-made-dep14
}
+baredebian-test-core () {
+ baredebian-test-core-prepush
+ baredebian-test-core-push
+ baredebian-test-core-postpush
+}
+
baredebian-test () {
baredebian-test-vars
baredebian-test-minimum
diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 27c5b06..a4482be 100644
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -44,6 +44,7 @@ bm-prep () {
bm-gbp-example-acts () {
t-gbp-example-prep
+ t-tstunt-parsechangelog
git checkout -b for-build-modes qc/quilt-tip-2
# build-modes cannot cope with branches containing /
diff --git a/tests/lib-core b/tests/lib-core
index bdf3a6c..7e98acf 100644
--- a/tests/lib-core
+++ b/tests/lib-core
@@ -15,9 +15,10 @@ t-set-intree () {
: ${DGIT_INFRA_PFX:=$DGIT_TEST_INTREE${DGIT_TEST_INTREE:+/infra/}}
: ${DGIT_GITDEBREBASE_TEST:=$DGIT_TEST_INTREE/git-debrebase}
: ${DGIT_MANPAGES_SOURCE_DIR:=$DGIT_TEST_INTREE}
+ : ${DEBPUSH_GIT_PLAYTREE_SETUP:=$DGIT_TEST_INTREE/git-playtree-setup}
export DGIT_TEST DGIT_BADCOMMIT_FIXUP
export DGIT_REPOS_SERVER_TEST DGIT_SSH_DISPATCH_TEST
- export DGIT_MANPAGES_SOURCE_DIR
+ export DGIT_MANPAGES_SOURCE_DIR DEBPUSH_GIT_PLAYTREE_SETUP
export PERLLIB="$DGIT_TEST_INTREE${PERLLIB:+:}${PERLLIB}"
}
diff --git a/tests/lib-gdr b/tests/lib-gdr
index cda11df..bf94fba 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -260,17 +260,7 @@ t-nmu-upload-2 () {
t-nmu-upload-3 () {
t-dch-commit-r
-
- t-dgit -wgf build-source
-
- cd ..
- c=${p}_${v}_source.changes
- debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
- dput -c $tmp/dput.cf test-dummy $c
-
- t-archive-process-incoming sid
- t-git-next-date
- cd $p
+ t-non-dgit-upload
git checkout master
}
diff --git a/tests/setup/examplegit b/tests/setup/examplegit
index 88f6178..d25ee95 100755
--- a/tests/setup/examplegit
+++ b/tests/setup/examplegit
@@ -50,4 +50,6 @@ push-to master sid
git clean -xdff
-t-setup-done 'p v suitespecs majorv revision' "aq git mirror $p"
+t-setup-done 'v suitespecs majorv revision' "aq git mirror $p" "
+ t-select-package $p
+"
diff --git a/tests/setup/gbp b/tests/setup/gbp
new file mode 100755
index 0000000..d8675fe
--- /dev/null
+++ b/tests/setup/gbp
@@ -0,0 +1,48 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-archive-none example
+t-git-none
+t-worktree 1.0
+
+cd $p
+
+: '----- construct an unpatched branch with patches -----'
+
+git checkout patch-queue/quilt-tip
+gbp pq export
+: 'now on quilt-tip'
+git add debian/patches
+git commit -m 'Commit patch queue'
+
+: '----- construct an upstream branch -----'
+
+git checkout --orphan upstream
+git reset --hard
+git clean -xdf
+
+tar --strip-components=1 -xf $troot/pkg-srcs/${p}_1.0.orig.tar.gz
+
+mkdir docs
+cd docs
+tar --strip-components=1 -xf $troot/pkg-srcs/${p}_1.0.orig-docs.tar.gz
+cd ..
+
+git add -Af .
+git commit -m 'Import 1.0'
+git tag upstream/1.0
+
+git checkout quilt-tip
+t-git-pseudo-merge -m 'gbp-orig pseudomerge' upstream
+
+v=1.0-1
+
+git checkout -B master
+
+cd ..
+
+t-setup-done 'v' "$(echo $p*) git mirror aq" '
+ t-select-package example
+ t-git-next-date
+'
diff --git a/tests/setup/http-git-check b/tests/setup/http-git-check
new file mode 100755
index 0000000..0e3b7c2
--- /dev/null
+++ b/tests/setup/http-git-check
@@ -0,0 +1,15 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-dependencies libhttp-server-simple-static-perl
+
+t-setup-done '' --files-from=/dev/null '
+ $troot/http-static-server >$tmp/must-clean/git-check.port $tmp/git
+ read <$tmp/must-clean/git-check.port git_check_port
+
+ t-git-config --global dgit-distro.test-dummy.git-check url
+ t-git-config --global dgit-distro.test-dummy.git-check-suffix .git/HEAD
+ t-git-config --global dgit-distro.test-dummy.git-check-url \
+ http://127.0.0.1:$git_check_port
+'
diff --git a/tests/tests/alternating-dgit b/tests/tests/alternating-dgit
new file mode 100755
index 0000000..c2ada5c
--- /dev/null
+++ b/tests/tests/alternating-dgit
@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-setup-import examplegit
+t-setup-import http-git-check
+
+cd $p
+
+git checkout -b nondgit
+t-commit 'non-dgit upload'
+t-non-dgit-upload
+
+cd ..
+
+t-dgit clone $p ./$p.2
+cd $p.2
+
+t-commit 'now a dgit upload again'
+
+t-dgit -wgf push-source
+t-refs-same-start
+t-pushed-good dgit/sid
+
+t-ok
diff --git a/tests/tests/clone-gitnosuite b/tests/tests/clone-gitnosuite
index 83c996d..b85efdb 100755
--- a/tests/tests/clone-gitnosuite
+++ b/tests/tests/clone-gitnosuite
@@ -2,6 +2,8 @@
set -e
. tests/lib
+t-setup-import http-git-check
+
t-archive pari-extra 3-1
t-git-none
cp -a $tmp/git/_template $dgitrepo
diff --git a/tests/tests/clone-nogit b/tests/tests/clone-nogit
index e99dac3..f36a7b6 100755
--- a/tests/tests/clone-nogit
+++ b/tests/tests/clone-nogit
@@ -2,6 +2,8 @@
set -e
. tests/lib
+t-setup-import http-git-check
+
t-archive pari-extra 3-1
t-git-none
diff --git a/tests/tests/fetch-somegit-notlast b/tests/tests/fetch-somegit-notlast
index 63abe8a..4e42aa3 100755
--- a/tests/tests/fetch-somegit-notlast
+++ b/tests/tests/fetch-somegit-notlast
@@ -10,6 +10,6 @@ t-dgit clone $p
cd $p
t-cloned-fetched-good
-t-has-ancestor debian/3-1
+t-has-ancestor test-dummy/3-1
t-ok
diff --git a/tests/tests/forcesplit-overwrite b/tests/tests/forcesplit-overwrite
index 9600d3a..5826287 100755
--- a/tests/tests/forcesplit-overwrite
+++ b/tests/tests/forcesplit-overwrite
@@ -7,8 +7,7 @@ set -e
t-setup-import examplegit
-t-select-package example
-cd example
+cd $p
suite=stable
diff --git a/tests/tests/ftpmasterapi-http b/tests/tests/ftpmasterapi-http
new file mode 100755
index 0000000..818a974
--- /dev/null
+++ b/tests/tests/ftpmasterapi-http
@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+. tests/lib
+
+t-archive-none example
+
+t-dependencies libhttp-server-simple-static-perl
+
+$troot/http-static-server >$tmp/must-clean/api.port $tmp/aq
+
+read <$tmp/must-clean/api.port api_port
+
+t-git-config --global dgit-distro.test-dummy.archive-query ftpmasterapi:
+t-git-config --global dgit-distro.test-dummy.archive-query-url \
+ http://127.0.0.1:$api_port/
+
+t-dgit archive-api-query suites
+
+t-ok
diff --git a/tests/tests/gbp-orig b/tests/tests/gbp-orig
index 9a4937c..c843663 100755
--- a/tests/tests/gbp-orig
+++ b/tests/tests/gbp-orig
@@ -2,49 +2,17 @@
set -e
. tests/lib
-t-tstunt-parsechangelog
-t-tstunt-debuild
-t-tstunt-lintian
-
-t-archive-none example
-t-git-none
-t-worktree 1.0
+t-setup-import gbp
cd $p
-: '----- construct an unpatched branch with patches -----'
-
-git checkout patch-queue/quilt-tip
-gbp pq export
-: 'now on quilt-tip'
-git add debian/patches
-git commit -m 'Commit patch queue'
-
-: '----- construct an upstream branch -----'
-
-git checkout --orphan upstream
-git reset --hard
-git clean -xdf
-
-tar --strip-components=1 -xf $troot/pkg-srcs/${p}_1.0.orig.tar.gz
-
-mkdir docs
-cd docs
-tar --strip-components=1 -xf $troot/pkg-srcs/${p}_1.0.orig-docs.tar.gz
-cd ..
-
-git add -Af .
-git commit -m 'Import 1.0'
-git tag upstream/1.0
-
-git checkout quilt-tip
-t-git-pseudo-merge -m 'gbp-orig pseudomerge' upstream
-
-v=1.0-1
+t-tstunt-parsechangelog
+t-tstunt-debuild
+t-tstunt-lintian
: '----- let gbp build a .orig for comparison -----'
-gbp buildpackage --git-ignore-branch --git-no-sign-tags -us -uc
+gbp buildpackage --git-no-sign-tags -us -uc
mkdir ../gbp-output
mv ../*1.0* ../gbp-output/.
diff --git a/tests/tests/gdr-import-dgit b/tests/tests/gdr-import-dgit
index e58ff32..1050f72 100755
--- a/tests/tests/gdr-import-dgit
+++ b/tests/tests/gdr-import-dgit
@@ -6,6 +6,7 @@ t-dependencies GDR
t-tstunt-parsechangelog
t-setup-import gdr-convert-gbp
+t-setup-import http-git-check
cd $p
diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index c626c08..9d3e45a 100755
--- a/tests/tests/tagupl
+++ b/tests/tests/tagupl
@@ -23,12 +23,30 @@ git tag $upstreamtag
git checkout -B master quilt-tip-2
+echo foo >bar
+git add bar
+git commit -m"corrupt the upstream source to test upstream-nonidentical check"
+
t-tagupl-settings
tagname=test-dummy/$v
+t-expect-fail "the upstream source in tag $upstreamtag is not identical to the upstream source in refs/heads/master" \
+t-tagupl-test --quilt=gbp --upstream=$upstreamtag
+
+git reset --hard HEAD~1
+
+t-expect-fail "upstream tag $upstreamtag is not an ancestor of refs/heads/master" \
t-tagupl-test --quilt=gbp --upstream=$upstreamtag
+t-expect-fail "upstream tag $upstreamtag is not an ancestor of refs/heads/master" \
+t-tagupl-test --quilt=gbp --force=suite --force=no-such-force-option --upstream=$upstreamtag
+
+t-tagupl-test --quilt=gbp --force=suite --force=no-such-force-option-1 \
+ --force=upstream-nonancestor,no-such-force-option-2 \
+ --upstream=$upstreamtag
+t-pushed-good master
+
# todo: test each miss/rejection
ident=ok
@@ -62,25 +80,26 @@ with-mangled () {
perl <../basetag >../badtag-$ident -pe "$perl"
git tag -u Senatus -f -s -m "$(cat ../badtag-$ident)" "$tagname"
+ LC_MESSAGES=C \
t-tagupl-run-drs $tmp/$p
}
expect-quit () {
next-mangle "$1"
local perl=$2
- local mstring=$3
+ local mregexp=$3
with-mangled "$perl"
- grep ": $mstring" ../tagupl/overall.log
+ egrep ": $mregexp" ../tagupl/overall.log
}
expect-email () {
next-mangle "$1"
local perl=$2
- local mstring=$3
+ local mregexp=$3
with-mangled "$perl"
- grep 'Was not successful' ../sendmail.log
- grep "$mstring" ../sendmail.log
- grep ": failed, emailed" ../tagupl/overall.log
+ egrep 'Was not successful' ../sendmail.log
+ egrep "$mregexp" ../sendmail.log
+ egrep ": failed, emailed" ../tagupl/overall.log
}
raw-mangled () {
@@ -119,7 +138,7 @@ expect-email bupstag1 's/ upstream-tag=/$&:/' \
"failed command: git check-ref-format"
expect-email bupstag2 's/ upstream-tag=/$&x/' \
- "Couldn't find remote ref refs/tags/xUPSTREAM"
+ "[Cc]ouldn't find remote ref refs/tags/xUPSTREAM"
expect-email wrongver '' 'mismatch: changelog Version'
diff --git a/tests/tests/tagupl-baredebian b/tests/tests/tagupl-baredebian
new file mode 100755
index 0000000..b485abb
--- /dev/null
+++ b/tests/tests/tagupl-baredebian
@@ -0,0 +1,38 @@
+#!/bin/bash
+set -e
+. tests/lib
+. $troot/lib-baredebian
+
+t-dependencies quilt git-debpush
+
+t-debpolicy
+
+t-setup-import baredebian
+
+cd $p
+
+baredebian-test-vars
+t-tagupl-settings
+
+baredebian-test-minimum
+baredebian-test-core-prepush
+
+
+sed -i '15icorruption' debian/patches/0002-Edit-the-.c-file.patch
+git add debian/patches/0002-Edit-the-.c-file.patch
+git commit -m"corrupt a quilt patch to test the patches-applicable check"
+
+tagname=test-dummy/$v
+
+t-expect-fail "'git apply' failed to apply patch 0002-Edit-the-.c-file.patch ('patches-applicable' check)" \
+t-tagupl-test --baredebian
+
+git reset --hard HEAD~1
+
+t-tagupl-test --baredebian
+
+git branch split.p dgit/dgit/sid # we didn't generate this here
+
+baredebian-test-core-postpush
+
+t-ok
diff --git a/tests/tests/tagupl-gbp b/tests/tests/tagupl-gbp
new file mode 100755
index 0000000..a4ecb09
--- /dev/null
+++ b/tests/tests/tagupl-gbp
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e
+. tests/lib
+. $troot/lib-baredebian
+
+t-dependencies git-debpush DEBORIG
+
+t-setup-import gbp
+
+t-debpolicy
+
+cd $p
+
+git deborig
+
+t-dgit -wgf --quilt=gbp --dgit-view-save=split.b quilt-fixup
+
+t-tagupl-settings
+
+tagname=test-dummy/$v
+
+t-tagupl-test --gbp
+
+git branch split.p dgit/dgit/sid # we didn't generate this here
+
+t-gbp-pushed-good sid
+
+t-ok
diff --git a/tests/tests/tagupl-native b/tests/tests/tagupl-native
index 694d879..e8a25c7 100755
--- a/tests/tests/tagupl-native
+++ b/tests/tests/tagupl-native
@@ -25,5 +25,6 @@ git commit -m 'convert to 1.0 native'
tagname=test-dummy/$v
t-tagupl-test
+t-pushed-good master
t-ok