Re: mergemaster options

2009-04-06 Thread Charles Howse
On Apr 6, 2009, at 5:43 AM, Charles Howse wrote: Hi, I'm upgrading form 4.6-RELEASE to 4.6-STABLE. So sorry...that should be from 6.4-RELEASE to 6.4-STABLE ___ freebsd-questions@freebsd.org mailing list

mergemaster options

2009-04-06 Thread Charles Howse
Hi, I'm upgrading form 4.6-RELEASE to 4.6-STABLE. When I get to the *second* run of mergemaster (after installworld), I'd be interested to hear the list's comments on using options to start mergemaster. For example, have you had good luck with: mergemaster -i -u (install any files that

Re: mergemaster options

2009-04-06 Thread Manolis Kiagias
Charles Howse wrote: Hi, I'm upgrading form 4.6-RELEASE to 4.6-STABLE. When I get to the *second* run of mergemaster (after installworld), I'd be interested to hear the list's comments on using options to start mergemaster. For example, have you had good luck with: mergemaster -i -u

Re: mergemaster options

2009-04-06 Thread Charles Howse
On Apr 6, 2009, at 7:03 AM, Manolis Kiagias wrote: Charles Howse wrote: Hi, I'm upgrading form 4.6-RELEASE to 4.6-STABLE. When I get to the *second* run of mergemaster (after installworld), I'd be interested to hear the list's comments on using options to start mergemaster. For example, have

Re: mergemaster options

2009-04-06 Thread Manolis Kiagias
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

Re: mergemaster options

2009-04-06 Thread Charles Howse
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,