Re: [Quilt-dev] [PATCH] Add option to use 'wiggle' to try to apply rejected patches.

[Andreas Gruenbacher]

Hello,

On Thursday 20 January 2005 11:25, Chris Larson wrote:
> Greetings,
>
> Here's a small patch that I found useful.  It adds a commandline option
> '-w', that when specified, calls out the 'wiggle' command to attempt to
> apply the rejects.  Wiggle can apply patches that patch cannot, and
> places conflicts in the file, not unlike the way SCM tools do, which is
> more intuitive for those not very experienced at patching tools.

Unified reject files somewhat improve the readability of reject files for me, 
but I agree that merging rejects still is a pain. I'm not happy with wiggle 
though: It's buggy; I don't trust it, and I wouldn't recommend it to anyone.

Chris Mason has been working on a "better wiggle" that seems to be in usable 
state already. I'm not sure what the best way is to integrate those things 
though. Right now I tend to prefer something like a separate wiggle command 
that goes through the top patches' reject files. On the other hand it may be 
better to integrate this into the push command; I really don't know yet.

Thanks,
-- 
Andreas Gruenbacher <address@hidden>
SUSE Labs, SUSE LINUX PRODUCTS GMBH