Re: Advice sought on upgrading from 4.11-R to 5.4...

Doug Barton <[EMAIL PROTECTED]> wrote: > I disagree that ignoring comments in the files is a good idea. There is no > way for mergemaster to know for sure if the comment is material or not, > that's the admin's job. Furthermore, it is non-trivial to automatically detect that a change is inside

Re: Advice sought on upgrading from 4.11-R to 5.4...

Brad, On Wed, 28 Sep 2005, Brad Knowles wrote: > However, it would be nice if mergemaster could be made to > automatically accept changes that occur only in the comments of the > files it is trying to merge. That way, many fewer "fluff" changes > would be presented during the merge process,

Re: Advice sought on upgrading from 4.11-R to 5.4...

At 4:15 PM -0700 2005-09-28, Doug Barton wrote: Ah, I misread the original message. Usually people are complaining about the CVS Ids in the comments, as opposed to the comments themselves. The CVS Ids are part of the issue, yes. But not the whole problem. I disagree that ignoring

Re: Advice sought on upgrading from 4.11-R to 5.4...

At 3:49 PM -0700 2005-09-28, Doug Barton wrote: What would be nice is if people actually read the man page for mergemaster, which has had this example in it for a long time now. I checked the man page. There is no direct "ignore" option, although there is a "strict" option. If you set up

Re: Advice sought on upgrading from 4.11-R to 5.4...

Robert Backhaus wrote: > On 9/29/05, Doug Barton <[EMAIL PROTECTED]> wrote: > >>Brad Knowles wrote: >> >> >>>However, it would be nice if mergemaster could be made to >>>automatically accept changes that occur only in the comments of the >>>files it is trying to merge. >> >>What would be nice

Re: Advice sought on upgrading from 4.11-R to 5.4...

On 9/29/05, Doug Barton <[EMAIL PROTECTED]> wrote: > Brad Knowles wrote: > > > However, it would be nice if mergemaster could be made to > > automatically accept changes that occur only in the comments of the > > files it is trying to merge. > > What would be nice is if people actually read the

Re: Advice sought on upgrading from 4.11-R to 5.4...

Brad Knowles wrote: > However, it would be nice if mergemaster could be made to > automatically accept changes that occur only in the comments of the > files it is trying to merge. What would be nice is if people actually read the man page for mergemaster, which has had this example in it f

Re: Advice sought on upgrading from 4.11-R to 5.4...

At 9:42 PM +0200 2005-09-21, Brad Knowles wrote: I've seen the migration guide at , and the thread at , but I was wondering about the specific sequ

Re: Advice sought on upgrading from 4.11-R to 5.4...

At 4:56 PM -0700 2005-09-21, Kevin Oberman wrote: Check in the CVS repository: http://www.freebsd.org/cgi/cvsweb.cgi/src/UPDATING?annotate=1.342.2.24&only_with_tag=RELENG_5_4 Thanks for the pointer! One down side of an upgrade in-place is that you don't get the larger root partit

Re: Advice sought on upgrading from 4.11-R to 5.4...

On Thursday, 22. September 2005 00:23, Brad Knowles wrote: > At 11:34 PM +0200 2005-09-21, Erik Trulsson wrote: > > And you should of course also read /usr/src/UPDATING as usual. > > That's the current version of the file from the 5.x tree, right? > Is there any obvious way to see what this

Re: Advice sought on upgrading from 4.11-R to 5.4...

> Date: Thu, 22 Sep 2005 00:23:18 +0200 > From: Brad Knowles <[EMAIL PROTECTED]> > Sender: [EMAIL PROTECTED] > > At 11:34 PM +0200 2005-09-21, Erik Trulsson wrote: > > > And you should of course also read /usr/src/UPDATING as usual. > > That's the current version of the file from the 5.x

Re: Advice sought on upgrading from 4.11-R to 5.4...

At 11:34 PM +0200 2005-09-21, Erik Trulsson wrote: And you should of course also read /usr/src/UPDATING as usual. That's the current version of the file from the 5.x tree, right? Is there any obvious way to see what this is without going ahead and downloading all the source anyway? Maybe

Re: Advice sought on upgrading from 4.11-R to 5.4...

On Wed, Sep 21, 2005 at 09:42:24PM +0200, Brad Knowles wrote: > Folks, > > I've seen the migration guide at > , and the > thread at > , > > but I was

Re: Advice sought on upgrading from 4.11-R to 5.4...

I went via cvsup and a source tree, straight to 5.4 stable from 4.10 stable. Brad Knowles wrote: Folks, I've seen the migration guide at , and the thread at