Re: [Quilt-dev] [patch] import -R (reverse)

[Jean Delvare]

On Sun, 18 Feb 2007 22:50:05 +0100, Jean Delvare wrote:
> Hi Randy,
> 
> Sorry for the late answer.
> 
> On Sun, 3 Dec 2006 21:39:16 -0800, Randy Dunlap wrote:
> > Hi,
> > 
> > I needed 'quilt import -R' recently and noticed that it is
> > listed in the TODO file.
> 
> This is an interesting feature I have often been missing myself, it
> would indeed be nice to implement it.
> 
> > This is likely missing something, so please tell me what it is.
> > It works, but I had to specify -p1 also, instead of it being
> > used as the normal default.  Anyone know why?
> 
> 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.

-- 
Jean Delvare