changelog: start 6.2

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

diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 3fc59d2f3ba5798a460ab6216f1cbe91465000fc..08083290c1139e14bd83cc7b41733ee1b4a89816 100644 (file)
--- a/dgit-sponsorship.7.pod
+++ b/dgit-sponsorship.7.pod
@@ -107,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.


@@ -197,12 +195,6 @@ Check the git commit ID of the sponsee's branch tip,
 and the sha256sums of the .origs,
 against the handoff email.
 
 and the sha256sums of the .origs,
 against the handoff email.
 

-Confirm that the sponsee has not made
-a debian/1.2.3-1 tag.
-If they have,
-it is best to ask them to delete it now,
-as it can cause confusion later when dgit push produces its own tag.
-

 Now you can check out the branch tip,
 and do your substantive review.
 
 Now you can check out the branch tip,
 and do your substantive review.
 


@@ -245,22 +237,34 @@ 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.
 

+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
 (It is possible to upload from

-the quilt-cache dgit view,
-but this will cause the debian/1.2.3-1 tag to be
-placed on this branch
-rather than the sponsee's working branch.
-Since this might be confusing,
-it is a good idea to switch back to the sponsee's view,
-after reviewing and before pushing.
-If you do want to upload from the quilt-cache dgit view,
-B<do not> pass the --quilt or --gbp or --dpm option again.)
+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
 C<--overwrite>
 to dgit.
 
 
 If this was the first upload done with dgit,
 you may need to pass
 C<--overwrite>
 to dgit.
 

+Alternatively,
+if this was the first ever dgit push of the package,
+you can pass C<--deliberately-not-fast-forward>
+instead of C<--overwrite>.
+This avoids introducing a new origin commit
+into the dgit view of
+the sponsee's git history
+which is unnecessary and could be confusing.

 
 =head1 SPONSORING A NON-GIT-USING SPONSEE
 
 
 =head1 SPONSORING A NON-GIT-USING SPONSEE