Date: Thu, 29 Sep 2005 10:41:20 +0800 (WST) From: David Adam <zanchey@ucc.gu.uwa.edu.au> To: Brad Knowles <brad@stop.mail-abuse.org> Cc: FreeBSD-STABLE Mailing List <freebsd-stable@freebsd.org> Subject: Re: Advice sought on upgrading from 4.11-R to 5.4... Message-ID: <Pine.LNX.4.58.0509291039000.22213@mussel.ucc.gu.uwa.edu.au> In-Reply-To: <p0620071dbf6044e1c455@[10.0.1.210]> References: <p0620070ebf57657f0697@[10.0.1.210]> <p0620071dbf6044e1c455@[10.0.1.210]>
next in thread | previous in thread | raw e-mail | index | archive | help
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@ucc.gu.uwa.edu.au
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.LNX.4.58.0509291039000.22213>