gEDA-dev: making patches

["Peter TB Brett" <peter-at-NOSPAMpeter-b_dot_co_dot_uk>]

Peter Clifton wrote:
> On Fri, 2006-07-21 at 13:11 -0400, DJ Delorie wrote:
>>
>> > I guess I'll find a workaround, perhaps getting two sets of sources,
>> > then add my changes to one, and produce a local diff using "diff".
>>
>> Here's a copy of my "cvslocal" script, which tells you which files
>> have been modified or added relative to what cvs thinks you should
>> have.
>>
>
> Thats really useful...
>
> Haven't looked at how it works, but for now, it certainly does the
> business on modified files.
>
> I'm still finding that cvs diff, and even your "cvslocal" script ignore
> a file which I created locally, and isn't on CVS.. thus the "cvs diff"
> patch won't actually contain that missing file...

Re making patches: I maintain 2 trees, a 'clean' tree and a 'dirty' tree. 
I then generated patches using 'diff -Naur dirty clean > new.patch'.  This
generates patches suitable for application with the 'patch' program. 
Obviously it's important to do a cvs update in both directories and
resolve any conflicts before doing this.

HTH,

Peter

P.S. Just got back from holiday, I'll be doing geda work from Monday.

--
Quake II build tools: https://adidas.servegame.org/projects/buildutils/



_______________________________________________
geda-dev mailing list
geda-dev@moria.seul.org
http://www.seul.org/cgi-bin/mailman/listinfo/geda-dev