From a944e7ea7ffbd5db3a7218c4b24706e818a73868 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Fri, 28 Oct 2011 10:14:01 +0200 Subject: [PATCH] sponsor-patch.1: Mention syncs (LP: #882085) --- debian/changelog | 1 + doc/sponsor-patch.1 | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b6b2423..6cb1d65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,7 @@ ubuntu-dev-tools (0.134) UNRELEASED; urgency=low - Add --fakesync option, relegating --no-lp to really crazy corner cases. * sponsor-patch: Compare new sync version to the current Ubuntu version, rather than itself (LP: #878499) + * sponsor-patch.1: Mention syncs (LP: #882085) [ Benjamin Drung ] * syncpackage: Catch user abort. diff --git a/doc/sponsor-patch.1 b/doc/sponsor-patch.1 index aa56b5b..96809ab 100644 --- a/doc/sponsor-patch.1 +++ b/doc/sponsor-patch.1 @@ -1,7 +1,6 @@ .TH sponsor\-patch "1" "September 21 2010" "ubuntu-dev-tools" .SH NAME -sponsor\-patch \- Pull a patch / merge request from Launchpad, -test-build it, and upload. +sponsor\-patch \- Prepare, test\-build, and sponsor an upload. .SH SYNOPSIS .B sponsor\-patch \fR[\fIoptions\fR] \fIbug @@ -15,8 +14,11 @@ builds it, runs .BR lintian (1) and, after review and confirmation, can upload it. -\fBsponsor\-patch\fR can be used for sponsoring patches, merges from -Debian, SRUs, and creating debdiffs from patches. +For syncs, sponsor\-patch will follow the usual procedure of commenting +on \fIbug\fR, marking it confirmed, and subscribing \fBubuntu-archive\fR. + +\fBsponsor\-patch\fR can be used for sponsoring patches, syncs and +merges from Debian, SRUs, and creating debdiffs from patches. If \fIbug\fR has multiple patches or branches linked, it will prompt the user to select one. The same applies to bug tasks.