Date: Sun, 21 Jan 2001 17:28:36 -0800 From: "Robert Banniza" <robert@rootprompt.net> To: <freebsd-stable@freebsd.org> Subject: RE: ssh problem Message-ID: <GMEDKMKMEBENJMBLDHAIEEEBCMAA.robert@rootprompt.net> In-Reply-To: <20010121152247.A74407@citusc17.usc.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
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... Robert -----Original Message----- From: owner-freebsd-stable@FreeBSD.ORG [mailto:owner-freebsd-stable@FreeBSD.ORG]On Behalf Of Kris Kennaway Sent: Sunday, January 21, 2001 3:23 PM To: O. Hartmann Cc: Kris Kennaway; freebsd-stable@FreeBSD.ORG Subject: Re: ssh problem On Mon, Jan 22, 2001 at 12:10:41AM +0100, O. Hartmann wrote: > On Sun, 21 Jan 2001, Kris Kennaway wrote: > But changes mergemaster not all the opther stuff we figured out and > set up? Only if you use it wrong :-) Kris -- NOTE: To fetch an updated copy of my GPG key which has not expired, finger kris@FreeBSD.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?GMEDKMKMEBENJMBLDHAIEEEBCMAA.robert>