? doc/cmbx12.log
? doc/cmsltt10.log
? doc/missfont.log
Index: doc/main.tex
===================================================================
RCS file: /cvsroot/quilt/quilt/doc/main.tex,v
retrieving revision 1.13
diff -u -r1.13 main.tex
--- doc/main.tex	8 May 2005 17:43:58 -0000	1.13
+++ doc/main.tex	30 May 2005 15:26:35 -0000
@@ -516,6 +516,44 @@
 } 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, sharing your patches is a
+very simple operation. Make sure your patches are all up to date using
+\quilt{refresh}, and distribute the contents of your patches directory.
+
+\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 that your original patches are all up to date using 
+\quilt{refresh}.
+
+Then if you start in a new directory, retrieve the new version of the sofwtare,
+(e.g. extract it from an archive or retrieve it from a remote source control
+repository) and copy your original \textsf{patches} directory inside this new
+directory. Otherwise, if you want to update your local version of the software
+using a source control client, you must first make sure your local tree is
+clean of your patches. You can ensure that by removing all patches using
+\quilt{pop -a} before applying the command that will update the local tree
+\footnote{
+    it's a mistake to merge your local changes using the source control
+    client. If you do that you will have a hard time updating your patches. In 
+    that case, it's better to start from scratch and reapply your patches on a
+    new project.
+}. You can double check the clean state of your local tree using the diff tool
+that comes with your source control client.
+
+Finally apply your patches, either one by one or all at once using
+\quilt{push -a}. If nothing fails, you're done. Otherwise you will have to clean
+up your patches. If one of your local patch was applied upstream, just remove 
+it using \quilt{delete}. If there are conflicts betweem the new code and a
+local patch, you may need to rework your patches and \quilt{refresh} them one
+at a time.
+
 \subsection{Forking}
 \label{sec:forking}
 
Index: doc/quilt.pdf
===================================================================
RCS file: /cvsroot/quilt/quilt/doc/quilt.pdf,v
retrieving revision 1.7
diff -u -r1.7 quilt.pdf
Binary files /tmp/cvsgjXvZR and quilt.pdf differ