Date: Fri, 18 Apr 1997 16:50:50 -0500 (CDT) From: Richard Neswold <neswold@aduxb.fnal.gov> To: hackers@freefall.freebsd.org Subject: Re: Accomodating Terry Message-ID: <Pine.GSO.3.95.970418163120.12193A-100000@aduxb.fnal.gov> In-Reply-To: <199704182059.NAA02898@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Terry Lambert <terry@lambert.org> said:
> > More importantly. Terry, are you even willing to work in a
> > separate branch of the repository or is Current the only thing acceptable?
>
> My main interest is in not having to reintegrate changes over and over
> and over so that I can do what I need to do, and still benefit from
> other contributors developement work at the same time.
>
> The big bottleneck in this right now is that there is no way for me
> (or anyone else) to assert local version control without committing
> changes through the main tree and supping them back in my local copy.
I haven't tried this yet, because I'm still familarizing myself with CVS and
CVSup, but this is how I was going to approach this problem:
1) Check out, from the repository, the branch I'm going to work on.
2) Go to the directory that contains the code I'm modifying.
3) Make an RCS subdirectory.
4) Use the RCS features of emacs to save intermediate changes to the RCS
subdirectory.
5) Once I'm satisfied my changes are stable, commit them with CVS.
Since emacs uses RCS, my local (buggy) history is stored in the RCS
subdirectory. When I commit the final version, CVS should ignore the RCS
directory and only commit the files I changed. Since no one cares about my
local history (only my final, stable code) it doesn't matter that the RCS
files are ignored.
CVS updates will still keep me current. I get revision control of my changes
while I develop. The main repository only gets my "final" source base.
Am I missing something in this scenario?
Rich
------------------------------------------------------------------------
Richard Neswold, Accelerator Div./Controls Dept | neswold@fnal.gov
Fermilab, PO Box 500, MS 347, Batavia, IL 60510 | voice (630) 840-3454
'finger neswold@aduxb.fnal.gov' for PGP key | fax (630) 840-3093
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.GSO.3.95.970418163120.12193A-100000>