From owner-freebsd-hackers Thu Dec 6 0:30: 8 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from luxren2.boostworks.com (luxren2.boostworks.com [194.167.81.214]) by hub.freebsd.org (Postfix) with ESMTP id B7F7637B416; Thu, 6 Dec 2001 00:29:50 -0800 (PST) Received: from boostworks.com (rn.lxlun.boostworks.com [192.168.8.100]) by luxren2.boostworks.com (8.11.3/8.11.3) with ESMTP id fB68TY699941; Thu, 6 Dec 2001 09:29:35 +0100 (CET) Message-Id: <200112060829.fB68TY699941@luxren2.boostworks.com> Date: Thu, 6 Dec 2001 09:29:30 +0100 (CET) From: remy@boostworks.com Subject: Re: How to handle replaced files in repos ? To: obrien@freebsd.org Cc: hackers@freebsd.org In-Reply-To: <20011205123336.A96803@dragon.nuxi.com> MIME-Version: 1.0 Content-Type: TEXT/plain; charset=us-ascii Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On 5 Dec, David O'Brien wrote: > On Wed, Dec 05, 2001 at 08:48:19PM +0100, remy@boostworks.com wrote: >> Aside from manually re-adding local changes, is there a way to avoid >> cvsup to replace files (that have been manually changed in the >> FreeBSD repos) when there are local branches ? > > Yes, somewhat. Have you read > http://www.polstra.com/projects/freeware/CVSup/faq.html#canilocal For sure. I use CVS_LOCAL_BRANCH_NUM and no delete for cvsup. All is working fine since years. I'm just pointing out the problem of a (probably manual) file replacement on the official repos. It do not arrive so often but it would be nice to have cvsup ring bells when it detect this and when 'delete' keyword is absent. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message