Date: Mon, 6 Apr 2009 11:26:21 -0500 From: Charles Howse <chowse@charter.net> To: Manolis Kiagias <sonic2000gr@gmail.com> Cc: FreeBSD Questions <freebsd-questions@freebsd.org> Subject: Re: mergemaster options Message-ID: <726F1B0E-BF6A-4F4B-BB7D-D71CFE1ED6FE@charter.net> In-Reply-To: <49DA1EAA.7030602@gmail.com> References: <AC90374B-AD31-4E02-955E-791C7BB8FB6F@charter.net> <49D9EFA8.709@gmail.com> <A78701B2-ACC1-4CF1-8AF8-D76CACDCEDDB@charter.net> <49DA1EAA.7030602@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Apr 6, 2009, at 10:24 AM, Manolis Kiagias wrote: > Charles Howse wrote: >> >> >> Actually, I wasn't asking about the CVS line with regard to >> mergemaster. I realize that mergemaster will stop and ask about any >> file in its list with a CVS line older than the new file. >> >> What I really want to know is, let's say the file above is >> /etc/hosts.allow, and I have customized it according to my needs. >> If I leave the old file in /etc, I'm thinking it will still work just >> fine. It's only mergemaster, and maybe cvsup, and things that >> actually deal with version control that are concerned with the CVS >> line. >> Am I correct? >> >> >> > You are correct. As long as the content of the file is right for the > purpose, the line added by CVS is simply ignored by anything and > everything - except mergemaster and friends when upgrading. As I suspected. Thanks for the confirmation. I have completed my upgrade to 6.4-STABLE with the following hiccups: mergemaster -iU couldn't find a btree database, so it skipped the auto update. It did save a database at the end, so I assume I can use that next time. I never thought to check for which side of the screen the old file was on after I chose "m" to merge. Finally figured out that the old file is on the left, and the temp on the right. Once finished completely, there were no problems I couldn't recover from. Good thing this is a brand new installation, with only 2 accounts! :-) Thanks for all the help!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?726F1B0E-BF6A-4F4B-BB7D-D71CFE1ED6FE>