From owner-freebsd-questions Sun Feb 28 15:48:59 1999 Delivered-To: freebsd-questions@freebsd.org Received: from waldorf.cs.uni-dortmund.de (waldorf.cs.uni-dortmund.de [129.217.4.42]) by hub.freebsd.org (Postfix) with ESMTP id 0807415005; Sun, 28 Feb 1999 15:48:54 -0800 (PST) (envelope-from grossjoh@ramses.informatik.uni-dortmund.de) Received: from ramses.informatik.uni-dortmund.de (ramses.cs.uni-dortmund.de [129.217.20.180]) by waldorf.cs.uni-dortmund.de with SMTP id AAA17174; Mon, 1 Mar 1999 00:48:37 +0100 (MET) Received: (grossjoh@localhost) by ramses.informatik.uni-dortmund.de id AAA29744; Mon, 1 Mar 1999 00:48:35 +0100 To: "Hao Xu" Cc: "questions@freebsd.org" , "freebsd-questions@freebsd.org" Subject: Re: cvs update & merge References: <19990226192219990-2f4755a9@Pulse.Com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii From: Kai.Grossjohann@CS.Uni-Dortmund.DE Date: 01 Mar 1999 00:27:06 +0100 In-Reply-To: "Hao Xu"'s message of "Fri, 26 Feb 1999 19:27 -0500" Message-ID: <86k8x2m7n9.fsf@slowfox.frob.org> User-Agent: Gnus/5.070078 (Pterodactyl Gnus v0.78) Emacs/20.3 Lines: 13 Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG "Hao Xu" 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