From owner-freebsd-questions  Fri Feb 26 16:26:31 1999
Delivered-To: freebsd-questions@freebsd.org
Received: from smtplink.pulse.com (unknown [192.77.130.229])
	by hub.freebsd.org (Postfix) with SMTP
	id B59B915019; Fri, 26 Feb 1999 16:26:26 -0800 (PST)
	(envelope-from Hao.Xu@Pulse.Com)
Date: Fri, 26 Feb 1999 19:27 -0500
From: "Hao Xu" <Hao.Xu@Pulse.Com>
To: "questions@freebsd.org" <questions@freebsd.org>,
	"freebsd-questions@freebsd.org" <freebsd-questions@freebsd.org>,
	"Hao Xu" <Hao.Xu@Pulse.Com>
Subject: cvs update & merge
Message-ID: <19990226192219990-2f4755a9@Pulse.Com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Sender: owner-freebsd-questions@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

I found that when I issued "cvs update -rREL_NAME" command, sometimes, the
REL_NAME version would *merge* with the current version in my work directory,
but sometimes, it would simply overwrite my current version.

There must be some rules here, any one can educate me?

Thanks a bunch,

-Hao 


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