question: maintaining patch separately from ports cvs

[Chris Knight]

Howdy,

> -----Original Message-----
> From: owner-freebsd-ports at freebsd.org On Behalf Of Kris Kennaway
> Sent: Wednesday, 28 January 2004 20:12
> To: Mohacsi Janos
> Cc: freebsd-ports at freebsd.org; Kris Kennaway
> Subject: Re: question: maintaining patch separately from ports cvs
> 
> [snip]
> > Like foo/bar/files/patch-local1 ? How can I save from being 
> > overwritten by the cvsup mirror?
> 
> Apparently you can do it with a "local branch" (documented in 
> the handbook and/or CVSup FAQ), but I don't know if many 
> people do that, or how difficult and impractical it is to use.
> 
"local branches" are OK when the size and frequency of the merges
is fairly low. Once the frequency increases, you're probably better
off to do regular imports of ports-all or of the individual ports
for which you have local mods for into your own repository. And
there's always perforce, which apparently makes this type of
process far easier. I've yet to tinker with perforce though.

Local branches are a bit of fun to set up. You also then have to
ensure your cvsup updates are done with -L 2 and watch the logs
for any Fixups or Replaces on the repo files for which you have
a local branch. You'll then need to check your branch changes
in these files and reapply them if necessary from your backups.

I have some docs on setting up local branches. I really should
get around to submitting it as a DocBook article. Feel free to
ask me for a copy if you want give this a try.

Regards,
Chris Knight
Systems Administrator
E-Easy
Tel: +61 3 6334 9995  Fax: +61 3 6331 7032  Mob: +61 419 528 795
Web: http://www.e-easy.com.au