Date: 26 Apr 1998 15:45:29 -0400 From: Kevin Street <street@iName.com> To: current@FREEBSD.ORG Subject: cvsup and local mods Message-ID: <8767jw9xk6.fsf@kstreet.interlog.com>
next in thread | raw e-mail | index | archive | help
I'm looking for advice on the best way to set up cvsup and cvs to
maintain local mods to source trees (both -current and the KDE tree).
I've read through the archives, but the latest discussion I've found
dates back about a year or so, so I wanted to check for new options.
>From what I read I've got a few alternatives:
a) cvsup in cvs mode. Do mods in my working tree and cvs update to
get the latest FreeBSD code.
I can't commit my local changes because cvsup will wipe them out.
I have no history for my mods.
b) cvsup in cvs mode. Set CVS_LOCAL_BRANCH_NUM to 1000, turn off
cvsup delete mode. Do my local mods on a branch and merge them with
the main line occasionally to pick up the FreeBSD changes.
John Polstra said (May 07 last year):
<199705080506.WAA11435@austin.polstra.com>
"And think long and hard before you do this in your local repository,
because such local mods are _not_ supported well by CVSup at this
time. It sort of works, if you remove the "delete" keyword, but
there are many problems with the approach."
I have not seen a discussion of what the problems are though.
c) cvsup in checkout mode. cvs import the whole tree as a vendor branch
in a local cvs tree and merge it with my mods on my main line when
I want to pick up the latest FreeBSD changes.
If I do this then I can't see the FreeBSD change history in my
cvs tree, but I can see my own history.
d) cvsup in cvs mode. cvs checkout a FreeBSD tree. cvs import this
into a local cvs tree as a vendor branch & merge with my main line.
Now I can see the history in the cvsuped FreeBSD tree and my history in
the local tree. I'm glad disks are cheap.
Other options? Errors in the above? Free advice? Pointers to info?
--
Kevin Street
street@iName.com
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?8767jw9xk6.fsf>