Date: Fri, 12 Nov 2010 09:40:01 -0700 (MST) From: Warren Block <wblock@wonkity.com> To: =?ISO-8859-15?Q?Leon_Me=DFner?= <l.messner@physik.tu-berlin.de> Cc: freebsd-questions@freebsd.org Subject: Re: mergemaster comparing everything. Message-ID: <alpine.BSF.2.00.1011120939200.10996@wonkity.com> In-Reply-To: <20101112162003.GA8921@emmi.physik-pool.tu-berlin.de> References: <20101112162003.GA8921@emmi.physik-pool.tu-berlin.de>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 12 Nov 2010, Leon Me?ner wrote: > is there a trick besides using the rcs funktion of mergemaster to get > around having to look at every file in /etc for comparison? > I know there once was a bug in mergemaster but it's closed for a long > time now. ... > 90% of the differences are just in this cvs? tag lines. This is an > upgrade from 8.1 to -STABLE. 'mergemaster -Ui' helps.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1011120939200.10996>