projects
/
~madcoder
/
fosdem.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
81d7977
)
s/frenglish/english/
master
author
Yves-Alexis Perez
<corsac@corsac.net>
Sat, 23 Feb 2008 13:39:51 +0000
(14:39 +0100)
committer
Pierre Habouzit
<madcoder@debian.org>
Sat, 23 Feb 2008 14:12:29 +0000
(15:12 +0100)
git.tex
patch
|
blob
|
history
diff --git
a/git.tex
b/git.tex
index
588aa90
..
922e2bb
100644
(file)
--- a/
git.tex
+++ b/
git.tex
@@
-44,7
+44,7
@@
\begin{itemize}
\item<3-> I wasn't able to work without network access;
\item<4-> I couldn't work incrementally: you have to get other's patches;
\begin{itemize}
\item<3-> I wasn't able to work without network access;
\item<4-> I couldn't work incrementally: you have to get other's patches;
- \item<5-> I couldn't
"try and see"
and maybe discard some work without
+ \item<5-> I couldn't
“try and see”
and maybe discard some work without
reverting patches: SVN never forgets;
\item<6-> I like having the full upstream source at hand, but svn explodes
doing that for large sources (KDE …).
reverting patches: SVN never forgets;
\item<6-> I like having the full upstream source at hand, but svn explodes
doing that for large sources (KDE …).
@@
-56,7
+56,7
@@
\begin{itemize}
\item<2-> Off-line work is possible, in fact you always work off-line;
\item<3-> Incremental work is possible;
\begin{itemize}
\item<2-> Off-line work is possible, in fact you always work off-line;
\item<3-> Incremental work is possible;
- \item<4-> \git{} allow you to completely erase a wrong idea if you didn't
+ \item<4-> \git{} allow
s
you to completely erase a wrong idea if you didn't
share it yet;
\item<5-> \git{} storage is extremely efficient: the marginal cost of
commits decreases with the number of commits.
share it yet;
\item<5-> \git{} storage is extremely efficient: the marginal cost of
commits decreases with the number of commits.
@@
-68,27
+68,27
@@
\vspace{1em}
\uncover<2->{
\vspace{1em}
\uncover<2->{
- xorg-xserver.git, goes back to 2000, is \alert{20M
o
} big. The last
- orig.tar.gz is 8M
o big, more than 84Mo
unpacked.
+ xorg-xserver.git, goes back to 2000, is \alert{20M
B
} big. The last
+ orig.tar.gz is 8M
B big, more than 84MB
unpacked.
}
\vspace{1em}
\uncover<3->{
dpkg.git, whole history since April 1996, generates a git pack of
}
\vspace{1em}
\uncover<3->{
dpkg.git, whole history since April 1996, generates a git pack of
- \alert{15M
o}. The last dpkg release is 17Mo
big unpacked.
+ \alert{15M
B}. The last dpkg release is 17MB
big unpacked.
}
\vspace{1em}
\uncover<4->{
}
\vspace{1em}
\uncover<4->{
- GNU libc version 2.7 weights 115M
o
unpacked. The full glibc history
- (starts in the eighties) generates a \git{} pack of \alert{104M
o
}.
+ GNU libc version 2.7 weights 115M
B
unpacked. The full glibc history
+ (starts in the eighties) generates a \git{} pack of \alert{104M
B
}.
}
\vspace{1em}
\uncover<5->{
}
\vspace{1em}
\uncover<5->{
- Though, this won't probably true for packages with a lot of binary stuff
- in it, where delta compression is less likely to produce good results
- (games data packages come to mind).
+ Though, this won't probably be true for packages with a lot of binary
+ stuff in it, where delta compression is less likely to produce good
+
results
(games data packages come to mind).
}
\end{frame}
}
\end{frame}
@@
-118,7
+118,7
@@
\item<2-> if upstream uses a public SVN or \git{} repository, I track
their SCM under the {\tt upstream/*} namespace.
\item<3-> if upstream tarballs differ from the SCM, I also add a
\item<2-> if upstream uses a public SVN or \git{} repository, I track
their SCM under the {\tt upstream/*} namespace.
\item<3-> if upstream tarballs differ from the SCM, I also add a
- {\tt upstream/tarballs} branch that replicates the tarball
+ {\tt upstream/tarballs} branch that replicates the tarball
s
directly.
\item<4-> if upstream only releases tarballs, I only have an
{\tt upstream} branch that is the successive import of tarballs.
directly.
\item<4-> if upstream only releases tarballs, I only have an
{\tt upstream} branch that is the successive import of tarballs.
@@
-150,12
+150,13
@@
\end{itemize}
\vspace{1ex}
\uncover<5->{
\end{itemize}
\vspace{1ex}
\uncover<5->{
- {\bf Demo:} let's rebase our patch branch for tokyocabinet
!
+ {\bf Demo:} let's rebase our patch branch for tokyocabinet!
}
\end{frame}
\begin{frame}{The repository layout: debian packaging}
}
\end{frame}
\begin{frame}{The repository layout: debian packaging}
- Finally, everything that is Debian specific is kept into a debian branch.
+ Finally, everything that is Debian specific is kept into a \texttt{debian}
+ branch.
\begin{itemize}
\item<2-> One branch per suite: {\tt debian-etch}, {\tt debian-sid}, {\tt
debian-exp};
\begin{itemize}
\item<2-> One branch per suite: {\tt debian-etch}, {\tt debian-sid}, {\tt
debian-exp};
@@
-166,7
+167,7
@@
\end{itemize}
\vspace{1ex}
\uncover<5->{
\end{itemize}
\vspace{1ex}
\uncover<5->{
- {\bf Demo:} let's release our tokyocabinet package
!
+ {\bf Demo:} let's release our tokyocabinet package!
}
\end{frame}
%}}}
}
\end{frame}
%}}}
@@
-183,12
+184,12
@@
\vspace{1em}
\uncover<3->{
\vspace{1em}
\uncover<3->{
- Then work like a pig, compulsively saving\^{}Wcommiting your stuff…
+ Then work like a pig, compulsively saving\^{}Wcommit
t
ing your stuff…
}
\vspace{1em}
\uncover<4->{
}
\vspace{1em}
\uncover<4->{
- And when you're happy of the current sate, let's pretend that you're a good
+ And when you're happy of the current s
t
ate, let's pretend that you're a good
boy.
}
boy.
}
@@
-220,9
+221,9
@@
}
\end{frame}
%}}}
}
\end{frame}
%}}}
-\section{The END
!}%{{{
+\section{The END!}%{{{
-\begin{frame}{The END
!}
+\begin{frame}{The END!}
If you're not too bored already, I'll gladly answer your questions now.
\vspace{2em}
If you're not too bored already, I'll gladly answer your questions now.
\vspace{2em}