Date: Tue, 27 Jul 2010 13:31:40 +0100 From: Frank Shute <frank@shute.org.uk> To: zaxis <z_axis@163.com> Cc: freebsd-questions@freebsd.org Subject: Re: I donot like using mergemaster ? Message-ID: <20100727123140.GA5410@orange.esperance-linux.co.uk> In-Reply-To: <29272211.post@talk.nabble.com> References: <29262747.post@talk.nabble.com> <201007260917.32632.jmc-freebsd2@milibyte.co.uk> <29272211.post@talk.nabble.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Mon, Jul 26, 2010 at 06:18:22PM -0700, zaxis wrote: > > > that's great ! I will use /etc/mergemaster.rc to upgrade my FB 8.0. > You might also want to put this line in mergemaster.rc: DIFF_OPTIONS='-I$FreeBSD:.*[$]' That makes mergemaster ignore changes in the CVS tags. With a good rc and a basic understanding of vi, you should be in good shape to make progress. I hated mergemaster when I first started using it but I love it now! Now I have to learn to love the "mergemaster" that freebsd-update uses... Anybody know how to make it ignore CVS tags? Regards, -- Frank Contact info: http://www.shute.org.uk/misc/contact.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20100727123140.GA5410>