Date: Fri, 12 Nov 2010 18:04:47 +0100 From: Leon =?iso-8859-15?Q?Me=DFner?= <l.messner@physik.tu-berlin.de> To: Warren Block <wblock@wonkity.com> Cc: Leon =?iso-8859-15?Q?Me=DFner?= <l.messner@physik.tu-berlin.de>, freebsd-questions@freebsd.org Subject: Re: mergemaster comparing everything. Message-ID: <20101112170447.GC8921@emmi.physik-pool.tu-berlin.de> In-Reply-To: <alpine.BSF.2.00.1011120939200.10996@wonkity.com> References: <20101112162003.GA8921@emmi.physik-pool.tu-berlin.de> <alpine.BSF.2.00.1011120939200.10996@wonkity.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, Nov 12, 2010 at 09:40:01AM -0700, Warren Block wrote: > 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. thanks, that helped. Did the default behavior of mergemaster change somewhere because i didn't have to do this awhile ago (months not years). greetings, Leon
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101112170447.GC8921>