On Mon, 19 Feb 2007 09:54:42 +0100 Jean Delvare wrote: > Hi Randy, > > On Sun, 18 Feb 2007 23:01:55 +0100, Jean Delvare wrote: > > On Sun, 18 Feb 2007 22:50:05 +0100, Jean Delvare wrote: > > > > > Not sure, maybe because of the issues below. > > > > In fact, no, it's a bug in the function patch_args that is called by > > "quilt push". It adds the default strip level (-p1) only if no option > > have been set for the patch, rather than if no -p option has been set. > > This is usually the same, except when you add -R, then it breaks as you > > found yourself. > > > > There are two ways to fix it: > > 1* If import -R is used and no -p value is given, add -p1 to the patch > > options. That's the easiest. > > 2* Actually fix function patch_args to add -p1 to the patch options if > > no -p option is found, rather than if the option string is empty. This > > will be slightly more difficult, but still doable, and cleaner too IMHO. > > I took the second approach as it was cleaner. Then I fixed the problems > I had found in your original patch, the code isn't really nice but it > works. And I also had to update change_db_strip_level to remove -R from > the patch args list, as refreshing a patch resets its "reverse" nature. > > Here's what I've come up with, which appears to work for me. Can you > please give it a try and confirm it works OK for you too? (CVS patch, > apply with -p0.)
Hi Jean, I just caught up with your messages. I'll test it later today and reply again. Thanks, --- ~Randy _______________________________________________ Quilt-dev mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/quilt-dev
