Date: Sun, 26 Sep 1999 19:22:52 +0200 (MET DST) From: Juergen Lock <nox@jelal.kn-bremen.de> To: mark@dogma.freebsd-uk.eu.org Cc: freebsd-ports@FreeBSD.ORG Subject: Re: Help with RCS files, patches, and PR's required. Message-ID: <199909261722.TAA97473@saturn.kn-bremen.de> In-Reply-To: <19990926162508.E282@marder-1>
next in thread | previous in thread | raw e-mail | index | archive | help
In article <19990926162508.E282@marder-1> you write: >I'm a relative newbie to using the ports so apologies if this is >a dumb question, but I did read the Handbook, FAQ, and several >other docs when I installed cvsup and started using it. > >I've just made patches for the bochs port for the latest source >code (990925, which allows Win95 to install without bombing at the >first reboot) and was about to submit a PR but then I noticed that >most (all?) port patches are diffs against the RCS (*,v) files. Well they are not `against' the RCS files, they were just generated using those (using `cvs diff'). > >OK, I'll do the same, but then I find I don't have any RCS files >on my system. If you want that and you have some >600MB free space somewhere then you'll need to grab (cvsup, ctm, ...) the cvs tree (a snapshot of it is also on the 4-CD set, you can use that as a starting point for cvsup to reduce net load...) Or use anoncvs, that should also work (which is what i do with the wine source). But you don't need that as long as you properly backup the version you cvsup'd before applying your local patches, and then diff -r against the backup (and revert to the backup before you cvsup again so you can backup the new versions again should there be any changes in the files you also changed)... Having the cvs tree available just makes this easier, no need to manually backup and keeping track of the original files, cvs knows how to deal with local patches. (and i can look at the commitlogs and checkout/diff against any versions/branches i want without needing/waiting for the net...) > >I use cvsup to keep my ports and docs trees up to date and one >thing I thought cvsup did the first time it was run was to build >a local RCS tree, in fact I believe(d) that it is exactly these >files that cvsup uses to determine what needs to be updated. > cvsup uses the cvs tree to determine what needs to be updated, but it doesn't mirror it on the local system. (unless you told it to of course, i.e. you cvsup the cvs tree itself.) >Furthermore I've got the patches submitted for the latest version >of the wine(1) source code (ports/13952) and these are indeed diffs >against the RCS files, so without local copies of these how can I >apply the patches other than by hand? Have you actually tried applying them? :) they should do just fine. (in a `cvs diff' type patch the `Index: ' lines tell patch(1) what files to patch, the `RCS file: ' lines are just comments for it.) Regards, -- Juergen Lock <nox.foo@jelal.kn-bremen.de> (remove dot foo from address to reply) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199909261722.TAA97473>