r474 - trunk/vim/debian

[Pierre Habouzit]

Author: madcoder
Date: 2006-01-19 17:31:07 +0000 (Thu, 19 Jan 2006)
New Revision: 474

Modified:
   trunk/vim/debian/README.quilt
Log:
update quilt best practices

Modified: trunk/vim/debian/README.quilt
===================================================================
--- trunk/vim/debian/README.quilt	2006-01-19 13:23:27 UTC (rev 473)
+++ trunk/vim/debian/README.quilt	2006-01-19 17:31:07 UTC (rev 474)
@@ -1,52 +1,77 @@
 
 Usage samples pack on quilt for VIM maintainers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-How to add a new quilt patch
-----------------------------
 
-0) unpack the vim sources:    fakeroot debian/rules extract
+  How to configure your quilt
+  ---------------------------
 
-1) position yourself in the patch stack at the patch after which you
-   would like to add the new one:    quilt push <reference_patchname>
+    have in your ~/.quiltrc :
 
-   if you don't care about patch ordering just add it at the end of the
-   patch stack using "quilt push -a"
+    QUILT_DIFF_ARGS="--no-timestamps -p 0"
+    QUILT_REFRESH_ARGS="--no-timestamps -p 0"
 
-    $ quilt push 151_sed.vim.diff
-    Applying patch 101_make.vim.diff
-    patching file vim/runtime/syntax/make.vim
+    or *always* use --no-timestamps -p 0 when you refresh a patch.
 
-    Applying patch 102_filetype.vim.diff
-    patching file vim/runtime/filetype.vim
-    ...
-    <snip>
-    ...
-    Now at patch 151_sed.vim.diff
-    $
 
-2) create a new patch:	    quilt new <patchname>
+  How to update fuzzy patches
+  ---------------------------
 
-    $ quilt new 152_javascript.vim.diff
-    Patch 152_javascript.vim.diff is now on top
-    $
+    ( set -e; quilt pop -a; \
+      for i in `quilt series`; do quilt push; quilt refresh; done )
 
-3) add the files you would like to change to the new patch _before_
-   modifying them:	    quilt add <filename>
+    it helps a lot when upstream filetype.vim changes, and that the patches have
+    to be resynchronize. The previous .quiltrc will make the diff of that
+    changes on the patches minimal
 
-    $ quilt add vim/runtime/syntax/javascript.vim
-    File vim/runtime/syntax/javascript.vim added to patch 152_javascript.vim.diff
-    $
 
-4) apply the needed changes to the added files
+-- Pierre Habouzit <madcoder at debian.org>  Thu, 19 Jan 2006 18:22:43 +0100
 
-5) generate the patch:	    quilt refresh
 
-    $ quilt refresh
-    Refreshed patch 152_javascript.vim.diff
-    $
+  How to add a new quilt patch
+  ----------------------------
 
-6) test, add the new patch to svn, commit, and be happy!
+    0) unpack the vim sources:    fakeroot debian/rules extract
 
---
-Stefano Zacchiroli <zack at debian.org>
-Sun, 15 Jan 2006 10:36:46 +0100
+    1) position yourself in the patch stack at the patch after which you
+       would like to add the new one:    quilt push <reference_patchname>
+
+       if you don't care about patch ordering just add it at the end of the
+       patch stack using "quilt push -a"
+
+        $ quilt push 151_sed.vim.diff
+        Applying patch 101_make.vim.diff
+        patching file vim/runtime/syntax/make.vim
+
+        Applying patch 102_filetype.vim.diff
+        patching file vim/runtime/filetype.vim
+        ...
+        <snip>
+        ...
+        Now at patch 151_sed.vim.diff
+        $
+
+    2) create a new patch:	    quilt new <patchname>
+
+        $ quilt new 152_javascript.vim.diff
+        Patch 152_javascript.vim.diff is now on top
+        $
+
+    3) add the files you would like to change to the new patch _before_
+       modifying them:	    quilt add <filename>
+
+        $ quilt add vim/runtime/syntax/javascript.vim
+        File vim/runtime/syntax/javascript.vim added to patch 152_javascript.vim.diff
+        $
+
+    4) apply the needed changes to the added files
+
+    5) generate the patch:	    quilt refresh
+
+        $ quilt refresh
+        Refreshed patch 152_javascript.vim.diff
+        $
+
+    6) test, add the new patch to svn, commit, and be happy!
+
+-- Stefano Zacchiroli <zack at debian.org>  Sun, 15 Jan 2006 10:36:46 +0100