X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=dgit-sponsorship.7.pod;h=8d5b72daa2de1e42b11820c132cda72c260d3ce9;hb=3ebc4309c3155cdacdc00900c8f3554932e32d5b;hp=3fc59d2f3ba5798a460ab6216f1cbe91465000fc;hpb=097ace3c0e2419f2717926405e944ab7137c99f6;p=dgit.git
diff --git a/dgit-sponsorship.7.pod b/dgit-sponsorship.7.pod
index 3fc59d2f..8d5b72da 100644
--- 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 sponsee should not make a CI tag.
-
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.
-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.
@@ -245,16 +237,20 @@ or similar, to to the build, and then
C
to do the upload.
+Check whether the sponsee made a debian/I 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,
-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 pass the --quilt or --gbp or --dpm option again.)
+the quilt-cache dgit view.
+If you want to do this,
+B pass the C<--quilt> or C<--gbp> or C<--dpm> options again,
+and B pass C<--no-dep14tag>,
+since the debian/I tag
+should go on the sponsee's branch.)
If this was the first upload done with dgit,
you may need to pass