On Feb 7, 2008, at 2:57 PM, Dan Nicholson wrote:
> On Feb 7, 2008 11:18 AM, Jeff Johnson <n3npq@mac.com> wrote:
>> This occurred because I applied the patch as follows:
>>
>> cd rpm50_checkouut
>> curl http://rpm5.org/cvs/chngview?cn=9423 | patch -p1
>>
>> Is there a better way to move patches around?
>
> cvsps is great for representing CVS commits as patchsets instead of
> whatever insanity is used in CVS.
>
> http://www.cobite.com/cvsps/
>
> I don't know if that will streamline your operation immediately, but
> in the long run it's nice to have. Here's an example starting from
> scratch:
>
Heh, any streamlining from what I'm currently doing (manually
cutting and pasting across multiple OS's and browser induced
damage etc etc) is an improvement in the quality of my life.
If you can believe it, that is the first time _EVER_ I've coupled
curl stdout to patch stdin.
> $ cvs -d :pserver:anonymous@rpm5.org:/cvs co rpm
> $ cd rpm
> # find out about patchsets on system.h; -q suppress warnings (there's
> quite a few in rpm :)
> $ cvsps -q -f system.h
> (This runs for a few minutes the first time as it caches the history
> of the repo in ~/.cvsps. After that, cvsps runs should be pretty
> quick. You may want to redirect output to a file.)
> # found the patchset, it's 9312; specify it with -s, generate the
> diff with -g
> $ cvsps -q -g -s 9312 > qnx-includes.patch
>
> Later, you can add the "-u" argument to your searches so the cache is
> updated. Otherwise, you're working directly from the cache and it's
> pretty quick.
>
Thank you! I knew there had to be a better way ... ;-)
> The alternative would be to use a better scm, but I'm sure that's not
> an answer you're looking for :)
>
I'll use any scm that is available. As long as the scm changes less
often
than once a month ...
73 de Jeff
Received on Thu Feb 7 21:07:10 2008