> Agreed, and documenting it is very needed. But let's keep the
> documentation concise, so that the reader actually understands how easy
> it is. Updating the codebase is a simple, 4 step process: pop all
> patches, update the codebase (whatever the method is), delete all
> redundant patches, push all remaining patches. I don't think we have to
> say more than just that.
>
> Thanks,
> --
> Jean Delvare
Second attempt :)
I also attach a small Makefile patch. I was confused each time
pdflatex was outputting something like
Output written on main.pdf (12 pages, 236344 bytes).
To find the doc in quilt.pdf later...
Comments appreciated.
Jerome
Index: quilt/doc/main.tex
===================================================================
--- quilt.orig/doc/main.tex 2005-06-12 15:19:41.000000000 +0200
+++ quilt/doc/main.tex 2005-06-12 15:53:38.961393029 +0200
@@ -516,6 +516,24 @@
} and then applying the patch to the working tree. The \quilt{fold}
command combines these steps.
+\subsection{Sharing your patches}
+
+You may sometimes need to share your patches with someone else, or
+reapply them on another instance of your software. As quilt patches are all
+contained in the \textsf{patches} directory, you just need to distribute
+this directory, making sure your patches are properly refreshed.
+You can also export all your patches in a single patch file using
+\quilt{diff --combine}.
+
+\subsection{Merging with upstream}
+
+The concept of merging your patches with upstream is identical to applying
+your patches on a more recent version of the software.
+
+First, make sure to pop all your patches using \quilt{pop -a}. Then update
+your codebase. Finally remove the obsoleted patches and \quilt{push} all
+remaining ones, refreshing and fixing those in need.
+
\subsection{Forking}
\label{sec:forking}
Index: quilt/doc/Makefile
===================================================================
--- quilt.orig/doc/Makefile 2003-11-12 01:38:06.000000000 +0100
+++ quilt/doc/Makefile 2005-06-12 16:06:13.734965276 +0200
@@ -4,8 +4,7 @@
dvips -t letter -o $@ $<
quilt.pdf: main.tex
- pdflatex -t letter $< && \
- mv main.pdf $@
+ pdflatex --jobname=quilt -t letter $<
quilt.dvi : main.tex
latex $< && \
_______________________________________________
Quilt-dev mailing list
[email protected]
http://lists.nongnu.org/mailman/listinfo/quilt-dev
