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>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990226192219990-2f4755a9>