From owner-freebsd-hackers  Wed Dec  5 11:48:59 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 8010237B416
	for <hackers@freebsd.org>; Wed,  5 Dec 2001 11:48:41 -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 fB5JmM698533
	for <hackers@freebsd.org>; Wed, 5 Dec 2001 20:48:23 +0100 (CET)
Message-Id: <200112051948.fB5JmM698533@luxren2.boostworks.com>
Date: Wed, 5 Dec 2001 20:48:19 +0100 (CET)
From: remy@boostworks.com
Subject: How to handle replaced files in repos ?
To: hackers@freebsd.org
MIME-Version: 1.0
Content-Type: TEXT/plain; charset=us-ascii
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-hackers.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-hackers>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-hackers>
X-Loop: FreeBSD.ORG

Hi all,

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 ?

ie: Someone recently replaced:

Replace src/contrib/gcc/config/alpha/freebsd.h,v
Replace src/contrib/gcc/config/freebsd.h,v
Replace src/contrib/gcc/config/i386/freebsd.h,v

and my local branches tags are gone.

TIA.

RN.
IaM






To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message