From owner-freebsd-current Wed Feb 7 12:20:58 1996 Return-Path: owner-current Received: (from root@localhost) by freefall.freebsd.org (8.7.3/8.7.3) id MAA24460 for current-outgoing; Wed, 7 Feb 1996 12:20:58 -0800 (PST) Received: from phaeton.artisoft.com (phaeton.Artisoft.COM [198.17.250.211]) by freefall.freebsd.org (8.7.3/8.7.3) with SMTP id MAA24452 for ; Wed, 7 Feb 1996 12:20:52 -0800 (PST) Received: (from terry@localhost) by phaeton.artisoft.com (8.6.11/8.6.9) id NAA06210 for current@freebsd.org; Wed, 7 Feb 1996 13:19:10 -0700 From: Terry Lambert Message-Id: <199602072019.NAA06210@phaeton.artisoft.com> Subject: CVS ISSUES To: current@freebsd.org Date: Wed, 7 Feb 1996 13:19:10 -0700 (MST) X-Mailer: ELM [version 2.4 PL24] MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: owner-current@freebsd.org Precedence: bulk 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 Lambert terry@lambert.org --- Any opinions in this posting are my own and not those of my present or previous employers.