test suite: Test already-tagged check

[dgit.git] / dgit.1

diff --git a/dgit.1 b/dgit.1
index 6e0c4f1186c2113795bc24cb14db02f396beef78..e619188434c988aaf9cc7bf4974fcfc78c66d560 100644 (file)
--- a/dgit.1
+++ b/dgit.1
@@ -631,7 +631,8 @@ This could perhaps be used to detect bugs in your rules clean target.
 .TP
 .BR -N " | " --new
 The package is or may be new in this suite.  Without this, dgit will
 .TP
 .BR -N " | " --new
 The package is or may be new in this suite.  Without this, dgit will

-refuse to push.  It may (for Debian, will) be unable to access the git
+refuse to push.
+It may (for Debian, will) be unable to access the git

 history for any packages which have been newly pushed and have not yet
 been published.
 .TP
 history for any packages which have been newly pushed and have not yet
 been published.
 .TP


@@ -790,8 +791,9 @@ The meanings of
 understood in the context of Debian are discussed below:
 .TP
 .BR --deliberately-not-fast-forward
 understood in the context of Debian are discussed below:
 .TP
 .BR --deliberately-not-fast-forward

-Declare that you are deliberately rewinding history.  When pushing to
-Debian, use this when you are making a renewed upload of an entirely
+Declare that you are deliberately rewinding history.
+When pushing to Debian,
+use this when you are making a renewed upload of an entirely

 new source package whose previous version was not accepted for release
 from NEW because of problems with copyright or redistributibility.
 
 new source package whose previous version was not accepted for release
 from NEW because of problems with copyright or redistributibility.
 


@@ -835,7 +837,7 @@ with as ancestor a patches-applied branch.
 .BR --quilt=auto
 When fixing up source format `3.0 (quilt)' metadata, prefer to
 generate a linear patch stack
 .BR --quilt=auto
 When fixing up source format `3.0 (quilt)' metadata, prefer to
 generate a linear patch stack

-(as with --quilt=auto)
+(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).
 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).


@@ -1291,6 +1293,13 @@ The result is a fresh import,
 discarding the git history
 that the person who pushed that .dsc was working with.
 .TP
 discarding the git history
 that the person who pushed that .dsc was working with.
 .TP

+.B \-\-force-reusing-version
+Carry on even though this involves reusing a version number
+of a previous push or upload.
+It is normally best to give different versions different numbers.
+Some servers (including, usually, the Debian server)
+will reject attempts to reuse or replace already-pushed versions.
+.TP

 .B \-\-force-uploading-binaries
 Carry on and
 upload binaries
 .B \-\-force-uploading-binaries
 Carry on and
 upload binaries


@@ -1327,6 +1336,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.
 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
 .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


@@ -1352,6 +1367,10 @@ may be a glob pattern.
 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.
 .TP
 .BI dgit.default.distro " distro"
 The default distro for an unknown suite.

+
+This is only used if no
+.BI /usr/share/distro-info/ somedistro .csv
+mentions the specified suite.

 .TP
 .BI dgit.default.default-suite " suite"
 The default suite (eg for clone).
 .TP
 .BI dgit.default.default-suite " suite"
 The default suite (eg for clone).


@@ -1471,7 +1490,7 @@ or when pushing and
 .TP
 .BI dgit-distro. distro .git-create " " ssh-cmd | true
 .TP
 .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
 .TP
 .BR dgit-distro. \fIdistro\fR .archive-query- ( url | tls-key | curl-ca-args )
 .TP


@@ -1519,7 +1538,7 @@ also the \-\-ssh= and \-\-ssh: options.
 Default git user.email and user.name for new trees.  See
 .BR "dgit setup-new-tree" .
 .TP
 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.
 and other subprograms and modules used by dgit are affected by various
 environment variables.  Consult the documentation for those programs
 for details.