From owner-freebsd-current Wed Mar 14 1:57: 0 2001 Delivered-To: freebsd-current@freebsd.org Received: from mta01.mail.mel.aone.net.au (mta01.mail.au.uu.net [203.2.192.81]) by hub.freebsd.org (Postfix) with ESMTP id EE6FB37B719 for ; Wed, 14 Mar 2001 01:56:57 -0800 (PST) (envelope-from thyerm@camtech.net.au) Received: from camtech.net.au ([203.28.1.237]) by mta01.mail.mel.aone.net.au with ESMTP id <20010314095656.KIGP23784.mta01.mail.mel.aone.net.au@camtech.net.au>; Wed, 14 Mar 2001 20:56:56 +1100 Message-ID: <3AAF418A.B817275D@camtech.net.au> Date: Wed, 14 Mar 2001 20:31:46 +1030 From: Matthew Thyer X-Mailer: Mozilla 4.76 [en] (X11; U; FreeBSD 5.0-CURRENT i386) X-Accept-Language: en MIME-Version: 1.0 To: Brian Somers Cc: Martin Blapp , current@FreeBSD.ORG Subject: Re: Proposal to mergemaster References: <200103140137.f2E1bZa10327@hak.lan.Awfulhak.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Brian Somers wrote: > 3. Have a cvs-aware option. > > If the installed and new version numbers differ, mergemaster does a > cvs diff -u -rINSTALLEDVERSION newversion | patch INSTALLEDFILE. If > this works, everyone's happy. If not, it forces you to modify the > new file 'till there are no <<<<< >>>>> bits in it. > Yes yes yes. Many people using mergemaster have the Repo on hand at $CVSROOT so this should be an option if not the default (when $CVSROOT is defined). For those who dont I suppose a directory could keep the unmodified versions of the currently installed files that mergemaster updates. Or maybe the versions could be fetched from the web (from cvsweb ?) To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message