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

David Adam zanchey at ucc.gu.uwa.edu.au
Wed Sep 28 19:41:26 PDT 2005


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, and people would be left
> with needing to confirm changes regarding only actual functional code.

It's been mentioned on this list before, but sysutils/etcmerge can often
provide a much faster way of bringing your system up to spec. Takes a bit
of getting used to, but definitely worthwhile.

David Adam
zanchey at ucc.gu.uwa.edu.au



More information about the freebsd-stable mailing list