Date: Wed, 7 Feb 1996 13:55:29 -0800 (PST) From: Julian Elischer <julian@ref.tfs.com> To: terry@lambert.org (Terry Lambert) Cc: current@FreeBSD.org Subject: Re: CVS ISSUES Message-ID: <199602072155.NAA00382@ref.tfs.com> In-Reply-To: <199602072019.NAA06210@phaeton.artisoft.com> from "Terry Lambert" at Feb 7, 96 01:19:10 pm
next in thread | previous in thread | raw e-mail | index | archive | help
> > Julian Elisher has noted some issues and I have tracked their source > to an (apparent) bug in CVS. > > > 1) SUP the main CVS tree > 2) Checkout a source tree > 3) Modify a file > 4) The same file is modified by another person in the > real source tree > 5) SUP update the local source tree copy.x > 6) CVS merge > 7) Changes in step #4 are apparently backed out in the merge > > > This isn't a problem if you always check in your modifications to > the main line tree, only if you are running a SUP update automatically > instead of manually. > > Why wasn't the diff against the version at the time of checkout > used to generate the patches applied to the current version (*NOT* > the version at the time of checkout, but a later version), and > that diff applied against the later (current via SUP) version? > > I think that CVS is not paying as much attention to the checked out > tree as it should, specifically in light of "proiscuous" changes to > the CVS tree vs. SUP. > > Opinions? Terry I think that what must have happend to you is a artifact (no not an artisoft) of possibly having to install everything piece-meal. probably it was a boundary condition of getting started.. what you suggest above is how I do ALL my development. it hasn't gone wrong ONCE. Hopefully now that you are up and going everything will work fine.. how about checking the following : wait for a commit message on the kernel. go to your sys checked out tree, make some change to the file that the commit was about. sup the new CVS tree. (check the new change arrives) do a cvs diff check what is in the diff do a cvs update check the file got the new changes do a cvs diff check the contents again. remove the file cvs update it again to refetch the unmodified (by you) version > > > Terry Lambert > terry@lambert.org > --- > Any opinions in this posting are my own and not those of my present > or previous employers. >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199602072155.NAA00382>