Keeping using locally modified source
Koster, K.J.
> > The problem is how do we keep up with -STABLE
> > afterwards? Using CVSup, out changes will get clobbered
> every time. Is
> > there a facility where you can keep up with the source but let local
> > modifications through?
>
> Yup, just use cvsup to maintain an up to date copy of the repository
> localy and then cvs checkout your source tree from there. This allows
> you to keep in sync and keep local modifications in your
> tree. Updates
> take longer and I recommend updating ports via direct cvsup instead of
> via cvs checkout (it's much faster if you aren't modifying ports), but
> it works quite well.
>
Ugh. That's a bit heavy, don't you think?
How about diffing your modifications into a patch file and apply the patch
every time between "make update" and "make world". Practical upshot is that
if you'd like to commit that work, you can just send the diffs. :-)
Kees Jan
==============================================
You are only young once,
but you can stay immature all your life
To Unsubscribe: send mail to majo...@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
James Howard
bind a socket to an address under IPv4. Basically, bind() needs to check
the caller's groups and if you are one of several allowable groups, let it
pass, otherwise, error out.
Now, I glanced over the bind() code and it does not look that
difficult. The problem is how do we keep up with -STABLE
afterwards? Using CVSup, out changes will get clobbered every time. Is
there a facility where you can keep up with the source but let local
modifications through?
Jamie
Brooks Davis
> At a site I am working at, we need to be able to limit which users can
> bind a socket to an address under IPv4. Basically, bind() needs to check
> the caller's groups and if you are one of several allowable groups, let it
> pass, otherwise, error out.
>
> Now, I glanced over the bind() code and it does not look that
> difficult. The problem is how do we keep up with -STABLE
> afterwards? Using CVSup, out changes will get clobbered every time. Is
> there a facility where you can keep up with the source but let local
> modifications through?
Yup, just use cvsup to maintain an up to date copy of the repository
localy and then cvs checkout your source tree from there. This allows
you to keep in sync and keep local modifications in your tree. Updates
take longer and I recommend updating ports via direct cvsup instead of
via cvs checkout (it's much faster if you aren't modifying ports), but
it works quite well.
-- Brooks
--
Any statement of the form "X is the one, true Y" is FALSE.
Don Lewis
} Subject: Re: Keeping using locally modified source
} There's even a hack in FreeBSD cvs and cvsup to allow you to keep a
} `local' branch that's not clobbered by cvsup, namely the environment
} variable CVS_LOCAL_BRANCH_NUM.
I thought about using this, but it doesn't appear to be easy to track
changes to an official branch. I was looking for something that would
be as easy tracking changes made by infrequent imports on the vendor
branch.
Assar Westerlund
> Yup, just use cvsup to maintain an up to date copy of the repository
> localy and then cvs checkout your source tree from there. This allows
> you to keep in sync and keep local modifications in your tree. Updates
> take longer and I recommend updating ports via direct cvsup instead of
> via cvs checkout (it's much faster if you aren't modifying ports), but
> it works quite well.
There's even a hack in FreeBSD cvs and cvsup to allow you to keep a
`local' branch that's not clobbered by cvsup, namely the environment
variable CVS_LOCAL_BRANCH_NUM.
/assar
Assar Westerlund
> I thought about using this, but it doesn't appear to be easy to track
> changes to an official branch. I was looking for something that would
> be as easy tracking changes made by infrequent imports on the vendor
> branch.
No, it's just a hack. Having hierarchical repositories would seem to
be the right way of attacking this but I don't know of any effort of
trying to fit that into CVS.
Bill Fenner
I've got this program in my head that takes a CVS tree and turns it
into a branch ofanother CVS tree (e.g. FreeBSD rev 1.7 turns into
rev 1.1.1.7) but it's never managed to make it out of my head, so
it must be harder than I keep thinking it is =)
Bill