From owner-freebsd-questions@FreeBSD.ORG Tue Jul 27 14:10:44 2010 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB4C8106567A for ; Tue, 27 Jul 2010 14:10:44 +0000 (UTC) (envelope-from kraduk@googlemail.com) Received: from mail-fx0-f54.google.com (mail-fx0-f54.google.com [209.85.161.54]) by mx1.freebsd.org (Postfix) with ESMTP id 3A2D58FC22 for ; Tue, 27 Jul 2010 14:10:43 +0000 (UTC) Received: by fxm13 with SMTP id 13so645702fxm.13 for ; Tue, 27 Jul 2010 07:10:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:received:received:in-reply-to :references:date:message-id:subject:from:to:content-type; bh=bNO3MJErvASOwnSoavLj9BH2JMfyyQsOfRiN/Gok3ng=; b=KTyqP1Qlm3Ar6o8/CUmvdxUxcrSdbsOAOiUIwWhGHE50Gcl2T9JJurz6JUAV/RkDSS IJzZnOQGdyQXuKPhxMgsMVw2BjkZJ+Cl7pPV8SygqlPJtYrDebVHkdoR36SjB2OdoLch lUEuJvTFyuEkO1elf0KTNC1HdkuyAs3JGe3cU= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type; b=IRC8jikIralQz84TYQvolWtLn0kxJ7u181rOtZDqpclVXDokgd1Il6hZ4ZrmWyi7DQ hrX7y9Pg8VedwGg6SudN2766fdTK/ZHam85SSiaNd8ScaFUCJrenmMwpk5acuqBaDgfj Fqff9iBFgAu49MXwt6WbHmMh/ChYYUrEs86DA= MIME-Version: 1.0 Received: by 10.239.177.197 with SMTP id w5mr610396hbf.167.1280239842307; Tue, 27 Jul 2010 07:10:42 -0700 (PDT) Received: by 10.239.160.201 with HTTP; Tue, 27 Jul 2010 07:10:42 -0700 (PDT) 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> Date: Tue, 27 Jul 2010 15:10:42 +0100 Message-ID: From: krad To: Frank Shute , zaxis , freebsd-questions@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Subject: Re: I donot like using mergemaster ? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 27 Jul 2010 14:10:44 -0000 On 27 July 2010 13:31, Frank Shute 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