[Quilt-dev] [patch] Documentation clarification in 'Merging with upstream'

[Ferran Jorba]

Andreas,

could you please take this documentation patch into consideration?

Thanks,

Ferran

Expanded a bit 'Merging with upstream' subsection, explaining how to deal
with in-place or tarballs cases.

Text taken almost verbatim from Andreas and Jean when replying to my
question in the -dev list.  So credits go to them.

Index: quilt-0.42/doc/main.tex
===================================================================
--- quilt-0.42.orig/doc/main.tex        2005-06-12 17:58:44.000000000 +0200
+++ quilt-0.42/doc/main.tex     2005-10-17 11:15:02.689463584 +0200
@@ -537,11 +537,20 @@
 The concept of merging your patches with upstream is identical to applying
 your patches on a more recent version of the software. 
 
-Before merging, make sure to pop all your patches using \quilt{pop -a}.
+If you are merging in-place (like a \prog{cvs update}),
+make sure to pop all your patches using \quilt{pop -a} before merging.
 Then, update your codebase. Finally, remove obsoleted patches
 from the series file and \quilt{push} the remaining ones, resolve
 conflicts and refresh patches as needed.
 
+If you are downloading tarballs (like official releases), create a
+copy ouf your \textsf{/patches} into your new tree, and apply the
+patches with \quilt{quilt push}. Don't copy the \textsf{.pc}
+directory.  Some of the patches may no more apply if they have been
+merged upstream. \quilt{quilt push} will fail on most of these, and
+you can use \quilt{quilt delete -rn} to delete them and skip to the
+next one.
+
 \subsection{Forking}
 \label{sec:forking}