[Pkg-shadow-commits] r252 - trunk/debian/patches

Nicolas FRANCOIS pkg-shadow-devel@lists.alioth.debian.org
Mon, 13 Jun 2005 23:12:44 +0000


Author: nekral-guest
Date: 2005-06-13 23:12:43 +0000 (Mon, 13 Jun 2005)
New Revision: 252

Modified:
   trunk/debian/patches/README.patches
Log:
Advice to revert all patches before updating a working directory.


Modified: trunk/debian/patches/README.patches
===================================================================
--- trunk/debian/patches/README.patches	2005-06-13 23:07:20 UTC (rev 251)
+++ trunk/debian/patches/README.patches	2005-06-13 23:12:43 UTC (rev 252)
@@ -44,7 +44,7 @@
 application. This is how it can refresh it afterward (comparing the version
 in .pc and the one you currently have in your working dir).
 
-There is two common pitfall with quilt:
+There are three common pitfalls with quilt:
  - doing "quilt pop" without doing "quilt refresh". The version of current
      dir is replaced with the version of the .pc dir. Your changes are lost.
    Quilt wont let you do so, but you can force it with '-f' if you're fool.
@@ -53,7 +53,10 @@
    Use "quilt add" to add files to patches.
    Set $EDITOR and use "quilt edit" to edit a file, and add it onto the
      patch if needed.
-		 
+ - If you update your working directory, patches may not revert cleanly.
+   It is thus recommended to use "quilt pop -a" before updating with
+   "svn up".
+
 The documentation is quite well done, I think. "quilt -h" will list you the
 commands. "quilt <cmd> -h" will give you some hints about it. "man quilt" is
 a reference documentation. /usr/share/doc/quilt/quilt.pdf.gz is a complete