From owner-freebsd-stable Mon Jan 22 2:21:37 2001 Delivered-To: freebsd-stable@freebsd.org Received: from emma1.emma.line.org (p3EE3C97F.dip.t-dialin.net [62.227.201.127]) by hub.freebsd.org (Postfix) with ESMTP id 72C6137B401 for ; Mon, 22 Jan 2001 02:21:19 -0800 (PST) Received: by emma1.emma.line.org (Postfix, from userid 500) id A38D4A2002; Mon, 22 Jan 2001 11:21:15 +0100 (CET) To: "Robert Banniza" Cc: Subject: Re: ssh problem References: In-Reply-To: From: Matthias Andree Date: 22 Jan 2001 11:21:15 +0100 Message-ID: Lines: 19 User-Agent: Gnus/5.0808 (Gnus v5.8.8) Emacs/20.7 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG "Robert Banniza" writes: > This brings me to a stupid question. It is better to install the new file > when cvsup'ing or merge the old and new file together? This is assuming the > user hasn't entered anything special into the file. I did an install on the > last cvsup rather than merging. I was somewhat confused when it asked me > whether I wanted to install the file on the right or the file on the left. > Shouldn't they be one in the same if merged? Any info. appreciated... If you did not touch that file, install the new one, it's the safe side and also less hassle on next merge ;-) If you changed parameters in that file, merge your changes into the new one, if in doubt, consult the man pages to figure that the configuration does and if a new parameter is required. You may find either Ctrl-Z useful or the "leave for later" choice in mergemaster. -- Matthias Andree To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message