fetch and pull ignore the changelog suite when it is UNRELEASED.

[dgit.git] / dgit-sponsorship.7.pod

diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 3b8c3a8b3ad54a42e09a0150bae9f22be921052a..8d5b72daa2de1e42b11820c132cda72c260d3ce9 100644 (file)
--- a/dgit-sponsorship.7.pod
+++ b/dgit-sponsorship.7.pod
@@ -71,7 +71,10 @@ The git branch.
 
 =item *
 
 
 =item *
 

-Any .orig tarballs which will be needed.
+Any .orig tarballs which will be needed,
+or sample git-archive(1)
+or gbp-buildpackage(1)
+command(s) to generate them.

 
 =item *
 
 
 =item *
 


@@ -104,8 +107,6 @@ alioth is another possibility.
 The branch names used by the sponsee on their local machine,
 and on the server, do not matter.
 
 The branch names used by the sponsee on their local machine,
 and on the server, do not matter.
 

-The sponsee should not make a C<debian/>I<version> tag.
-

 Instead, the sponsee should include the
 git commit id of their HEAD
 in their handover email.
 Instead, the sponsee should include the
 git commit id of their HEAD
 in their handover email.


@@ -119,8 +120,16 @@ in their handover email.
 If there are any .origs that are not in the archive already,
 the sponsor will need them as part of the upload.
 
 If there are any .origs that are not in the archive already,
 the sponsor will need them as part of the upload.
 

-The simplest approach is to
-commit them with pristine-tar(1), e.g.
+If the sponsee generated these tarballs with git-archive(1)
+or gbp-buildpackage(1),
+they can simply include a sample invocation of git-archive(1)
+or ensure that a suitable gbp.conf is present
+in the source package
+to generate the tarball.
+
+Otherwise, the simplest approach is to
+commit the orig tarballs
+with pristine-tar(1), e.g.

 
 =over 4
 
 
 =over 4
 


@@ -138,7 +147,8 @@ or attach to the e-mail,
 if they are small.
 
 The sponsee should quote sha256sums of the .origs in their
 if they are small.
 
 The sponsee should quote sha256sums of the .origs in their

-handoff email.
+handoff email,
+unless they supplied commands to generate them.

 
 =back
 
 
 =back
 


@@ -178,7 +188,8 @@ Use C<git fetch> or C<git clone> to obtain the git branch
 prepared by your sponsee,
 and obtain any .origs mentioned by the sponsee
 (to extract .origs committed with pristine-tar,
 prepared by your sponsee,
 and obtain any .origs mentioned by the sponsee
 (to extract .origs committed with pristine-tar,

-you can use origtargz(1).)
+you can use origtargz(1),
+or use "gbp clone --pristine-tar".)

 
 Check the git commit ID of the sponsee's branch tip,
 and the sha256sums of the .origs,
 
 Check the git commit ID of the sponsee's branch tip,
 and the sha256sums of the .origs,


@@ -195,9 +206,8 @@ you can convert their tree into the standard dgit view:
 
 =over 4
 
 
 =over 4
 

-    % dgit -wgf quilt-fixup
-    [ Watch for a message about split brain, and if so: ]
-    % git checkout -b dgit-view-for-review refs/dgit-intern/quilt-cache
+    % dgit -wgf --quilt=foo --dgit-view-save=unquilted quilt-fixup
+    % git checkout unquilted

 
 =back
 
 
 =back
 


@@ -227,8 +237,20 @@ or similar, to to the build, and then
 C<dgit -wgf [--quilt=...] push>
 to do the upload.
 
 C<dgit -wgf [--quilt=...] push>
 to do the upload.
 

-(If you switched to the quilt-cache dgit view,
-B<do not> pass the --quilt or --gbp or --dpm option again.)
+Check whether the sponsee made a debian/I<version> tag.
+If they did,
+ensure you have their tag in the repository you are pushing from,
+or pass C<--no-dep14tag>.
+This avoids identically named, non-identical tags,
+which can be confusing.
+
+(It is possible to upload from
+the quilt-cache dgit view.
+If you want to do this,
+B<do not> pass the C<--quilt> or C<--gbp> or C<--dpm> options again,
+and B<do> pass C<--no-dep14tag>,
+since the debian/I<version> tag
+should go on the sponsee's branch.)

 
 If this was the first upload done with dgit,
 you may need to pass
 
 If this was the first upload done with dgit,
 you may need to pass


@@ -258,6 +280,17 @@ Then:
 
 =back
 
 
 =back
 

+Or for an entirely new package:
+
+=over 4
+
+    % mkdir PACKAGE
+    % cd PACKAGE
+    % git init
+    % dgit -pPACKAGE import-dsc /path/to/sponsee's.dsc +sponsee
+
+=back
+

 This will leave you looking at the sponsee's package,
 formatted as a dgit branch.
 
 This will leave you looking at the sponsee's package,
 formatted as a dgit branch.