Date: 01 Mar 1999 00:27:06 +0100 From: Kai.Grossjohann@CS.Uni-Dortmund.DE To: "Hao Xu" <Hao.Xu@Pulse.Com> Cc: "questions@freebsd.org" <questions@FreeBSD.ORG>, "freebsd-questions@freebsd.org" <freebsd-questions@FreeBSD.ORG> Subject: Re: cvs update & merge Message-ID: <86k8x2m7n9.fsf@slowfox.frob.org> In-Reply-To: "Hao Xu"'s message of "Fri, 26 Feb 1999 19:27 -0500" References: <19990226192219990-2f4755a9@Pulse.Com>
next in thread | previous in thread | raw e-mail | index | archive | help
"Hao Xu" <Hao.Xu@Pulse.Com> writes: > 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. If you changed your local copy, it will merge (the changes on the server with the local changes). Otherwise, it will overwrite. kai -- I like _b_o_t_h kinds of music. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86k8x2m7n9.fsf>