[Pkg-shadow-devel] CVS sid: debian/patches do not unapply cleanly

Alexander Gattin arg@online.com.ua
Sun, 17 Apr 2005 21:35:20 +0300


On Sun, Apr 17, 2005 at 11:24:36AM +0200, Nicolas François wrote:
> On Sun, Apr 17, 2005 at 10:58:16AM +0200, Christian Perrier wrote:
> > debian/rules patch  <<<<<works OK
> > debian/rules unpatch  <<<<chokes on 005....
> > 
> > 
> > I bet this is still a problem with RCS lines but I thought Alexander
> > fixed them all....

No, only 005 and 201 (current keyword subst mode: o).
Other patches still have 'kv' mode.

008, 008.new, 200 and 402 has $Id: lines in them but
still apply (with fuzz).

Probably, it's a matter of preference to keep 'kv' as
long as possible (as long as it doesn't break things),
just for pleasure of seeing yourself mentioned in
source files. ;)

> I had a similar problem.
> It was due to patches being applied in one order, and being unapplied in
> the same order (not the reversed order).

Looks like bug in dpatch, really. It's funny to see
how dpatch is called with right cmdline, i.e.
`dpatch deapply
   405_subsystem_remove_*_in_shell
   404_undef_USE_PAM
   ...
   001_Makefile.in.in`
but then patch decides to reverse the order again. :)

-- 
WBR,
xrgtn