From owner-cvs-all Sun Jun 3 22:35: 4 2001 Delivered-To: cvs-all@freebsd.org Received: from peter3.wemm.org (c1315225-a.plstn1.sfba.home.com [65.0.135.147]) by hub.freebsd.org (Postfix) with ESMTP id 015FE37B401; Sun, 3 Jun 2001 22:34:58 -0700 (PDT) (envelope-from peter@wemm.org) Received: from overcee.netplex.com.au (overcee.wemm.org [10.0.0.3]) by peter3.wemm.org (8.11.0/8.11.0) with ESMTP id f545YvM40560; Sun, 3 Jun 2001 22:34:57 -0700 (PDT) (envelope-from peter@wemm.org) Received: from wemm.org (localhost [127.0.0.1]) by overcee.netplex.com.au (Postfix) with ESMTP id DCFD9380E; Sun, 3 Jun 2001 22:34:57 -0700 (PDT) (envelope-from peter@wemm.org) X-Mailer: exmh version 2.3.1 01/18/2001 with nmh-1.0.4 To: Doug Barton Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh In-Reply-To: <200106040411.f544BfJ30258@freefall.freebsd.org> Date: Sun, 03 Jun 2001 22:34:57 -0700 From: Peter Wemm Message-Id: <20010604053457.DCFD9380E@overcee.netplex.com.au> Sender: owner-cvs-all@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Doug Barton wrote: > dougb 2001/06/03 21:11:41 PDT > > Modified files: (Branch: RELENG_4) > usr.sbin/mergemaster mergemaster.sh > Log: > MFC 1.19-23, cleanups and clarifications, along with some OpenBSD > compatibility changes. No new functionality. Any chance you will add the hooks to read $Id$ / $FreeBSD$ and pull out the base versions from a local cvs tree for merging with merge(1) some day? mergemaster will be a lot more usable after that as you can tell if you can then let it attempt to do a 3-way merge. It doesn't have to do everything to start with, but it needs to start somewhere so that people can figure out other 'fetch file X rev Y' methods. Cheers, -Peter -- Peter Wemm - peter@FreeBSD.org; peter@yahoo-inc.com; peter@netplex.com.au "All of this is for nothing if we don't go to the stars" - JMS/B5 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message