chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dgit-maint-merge(7): Do not cross-reference nonexistent dgit-maint-rebase(7)
[dgit.git]
/
dgit-sponsorship.7.pod
diff --git
a/dgit-sponsorship.7.pod
b/dgit-sponsorship.7.pod
index 45889fcf2bb82db8fa35800204f9b5ea6d129615..8feb0d198657c53ece95685e80f8deef7beaeeaa 100644
(file)
--- a/
dgit-sponsorship.7.pod
+++ b/
dgit-sponsorship.7.pod
@@
-59,7
+59,7
@@
options to dgit, or
C<dgit --gbp> or C<dgit --dpm>,
you must specify that in your handoff email - see below.
C<dgit --gbp> or C<dgit --dpm>,
you must specify that in your handoff email - see below.
-=head
1 GIT+ORIGS BASED HANDOFF
+=head
2 git+origs based handoff
The elements of the handoff consists of:
The elements of the handoff consists of:
@@
-92,7
+92,9
@@
the elements above should be a in a single, signed, message.
This could be an RFS submission
against the sponsorship-requests pseudo-package.
This could be an RFS submission
against the sponsorship-requests pseudo-package.
-=head2 git branch
+=head3 git branch
+
+=over 4
The sponsee should push their HEAD as a git branch
to any suitable git server.
The sponsee should push their HEAD as a git branch
to any suitable git server.
@@
-104,11
+106,15
@@
and on the server, do not matter.
The sponsee should not make a C<debian/>I<version> tag.
The sponsee should not make a C<debian/>I<version> tag.
-Instead, the spons
or
should include the
+Instead, the spons
ee
should include the
git commit id of their HEAD
in their handover email.
git commit id of their HEAD
in their handover email.
-=head2 orig tarballs
+=back
+
+=head3 orig tarballs
+
+=over 4
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.
@@
-134,7
+140,11
@@
if they are small.
The sponsee should quote sha256sums of the .origs in their
handoff email.
The sponsee should quote sha256sums of the .origs in their
handoff email.
-=head2 quilt options
+=back
+
+=head3 quilt options
+
+=over 4
Some workflows involve git branches which are not natively
dgit-compatible.
Some workflows involve git branches which are not natively
dgit-compatible.
@@
-168,12
+178,19
@@
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,
against the handoff email.
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.
Now you can check out the branch tip,
and do your substantive review.
@@
-185,9
+202,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
@@
-248,6
+264,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.