Date: Tue, 27 Jul 2010 15:10:42 +0100 From: krad <kraduk@googlemail.com> To: Frank Shute <frank@shute.org.uk>, zaxis <z_axis@163.com>, freebsd-questions@freebsd.org Subject: Re: I donot like using mergemaster ? Message-ID: <AANLkTinqKZ4vKNbfq6V-krN7=pSja=TtHVsOt6kynubX@mail.gmail.com> In-Reply-To: <20100727123140.GA5410@orange.esperance-linux.co.uk> References: <29262747.post@talk.nabble.com> <201007260917.32632.jmc-freebsd2@milibyte.co.uk> <29272211.post@talk.nabble.com> <20100727123140.GA5410@orange.esperance-linux.co.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On 27 July 2010 13:31, Frank Shute <frank@shute.org.uk> wrote: > 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 > > > _______________________________________________ > freebsd-questions@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-questions > To unsubscribe, send any mail to " > freebsd-questions-unsubscribe@freebsd.org" > Personally I wouldn't touch the update tool. I like to stick to the tried and tested cvsup, and make world method ive used for over 10 years
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTinqKZ4vKNbfq6V-krN7=pSja=TtHVsOt6kynubX>