chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changelog: start 2.11~
[dgit.git]
/
dgit-user.7.pod
diff --git
a/dgit-user.7.pod
b/dgit-user.7.pod
index e7300522098434daf7f3053d7745873f50a1e8de..95d08d8e6ee2010669775e8e6e1c27777616ec5b 100644
(file)
--- a/
dgit-user.7.pod
+++ b/
dgit-user.7.pod
@@
-30,7
+30,7
@@
or L<dgit(1)> and L<dgit(7)>.
=over 4
=over 4
- % dgit clone glibc jessie
+ % dgit clone glibc jessie
,-security
% cd glibc
% wget 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u
% git commit -a -m 'Fix libc lost output bug'
% cd glibc
% wget 'https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=28250;mbox=yes;msg=89' | patch -p1 -u
% git commit -a -m 'Fix libc lost output bug'
@@
-55,7
+55,7
@@
Later:
=over 4
% cd glibc
=over 4
% cd glibc
- % dgit pull jessie
+ % dgit pull jessie
,-security
% gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit
% dpkg-buildpackage -uc -b
% sudo dpkg -i ../libc6_*.deb
% gbp dch -S --since=dgit/dgit/sid --ignore-branch --commit
% dpkg-buildpackage -uc -b
% sudo dpkg -i ../libc6_*.deb
@@
-66,7
+66,7
@@
Later:
=over 4
=over 4
- % dgit clone glibc jessie
+ % dgit clone glibc jessie
,-security
% cd glibc
=back
% cd glibc
=back
@@
-125,15
+125,22
@@
If you don't know what you're running, try this:
=back
=back
+For Debian, you should add C<,-security>
+to the end of the suite name.
+Hence, in our example
+C<jessie> becomes C<jessie,-security>.
+(Yes, with a comma.)
+
=head1 WHAT DGIT CLONE PRODUCES
=head2 What branches are there
dgit clone will give you a new working tree,
=head1 WHAT DGIT CLONE PRODUCES
=head2 What branches are there
dgit clone will give you a new working tree,
-and arrange for you to be on a branch like
-C<dgit/jessie
>
.
+and arrange for you to be on a branch
named
like
+C<dgit/jessie
,-security> (yes, with a comma in the branch name)
.
-There is a tracking branch for the contents of the archive, called
+For each release (like C<jessie>)
+there is a tracking branch for the contents of the archive, called
C<remotes/dgit/dgit/jessie>
(and similarly for other suites). This can be updated with
C<dgit fetch jessie>.
C<remotes/dgit/dgit/jessie>
(and similarly for other suites). This can be updated with
C<dgit fetch jessie>.
@@
-141,6
+148,10
@@
This, the I<remote suite branch>,
is synthesized by your local copy of dgit.
It is fast forwarding.
is synthesized by your local copy of dgit.
It is fast forwarding.
+Debian separates out the security updates, into C<debian-security>.
+Telling dgit C<debian,-security> means that it should include
+any updates available in C<debian-security>.
+
(You can also dgit fetch in a tree that wasn't made by dgit clone.
If there's no C<debian/changelog>
you'll have to supply a C<-p>I<package> option to dgit fetch.)
(You can also dgit fetch in a tree that wasn't made by dgit clone.
If there's no C<debian/changelog>
you'll have to supply a C<-p>I<package> option to dgit fetch.)
@@
-189,6
+200,9
@@
history invented by dgit.
dgit histories often contain automatically-generated commits,
including commits which make no changes but just serve
to make a rebasing branch fast-forward.
dgit histories often contain automatically-generated commits,
including commits which make no changes but just serve
to make a rebasing branch fast-forward.
+This is particularly true of
+combining branches like
+C<jessie,-security>.
If the package maintainer is using git then
after dgit clone
If the package maintainer is using git then
after dgit clone
@@
-362,7
+376,7
@@
but passing C<--force-overwrite> to dpkg will help
=head1 SHARING YOUR WORK
=head1 SHARING YOUR WORK
-The C<dgit/jessie> branch (or whatever) is a normal git branch.
+The C<dgit/jessie
,-security
> branch (or whatever) is a normal git branch.
You can use C<git push> to publish it on any suitable git server.
Anyone who gets that git branch from you
You can use C<git push> to publish it on any suitable git server.
Anyone who gets that git branch from you
@@
-391,15
+405,15
@@
you need to provide a source package
but don't care about its format/layout
(for example because some software you have consumes source packages,
not git histories)
but don't care about its format/layout
(for example because some software you have consumes source packages,
not git histories)
-you can use this recipe to generate a C<
1.0> "native"
+you can use this recipe to generate a C<
3.0 (native)>
source package, which is just a tarball
with accompanying .dsc metadata file:
=over 4
source package, which is just a tarball
with accompanying .dsc metadata file:
=over 4
- %
git rm debian/source/version
- % git commit -m 'switch to
1.0 source format'
- % dgit -wgf
--dpkg-buildpackage:-sn
build-source
+ %
echo '3.0 (native)' >debian/source/format
+ % git commit -m 'switch to
native source format' debian/source/format
+ % dgit -wgf build-source
=back
=back