From owner-cvs-all Sun Jun 3 22:59:41 2001 Delivered-To: cvs-all@freebsd.org Received: from dt051n37.san.rr.com (dt051n37.san.rr.com [204.210.32.55]) by hub.freebsd.org (Postfix) with ESMTP id F0E9337B403; Sun, 3 Jun 2001 22:59:36 -0700 (PDT) (envelope-from DougB@DougBarton.net) Received: from DougBarton.net (master [10.0.0.2]) by dt051n37.san.rr.com (8.9.3/8.9.3) with ESMTP id WAA13181; Sun, 3 Jun 2001 22:59:35 -0700 (PDT) (envelope-from DougB@DougBarton.net) Message-ID: <3B1B23C7.8158812@DougBarton.net> Date: Sun, 03 Jun 2001 22:59:35 -0700 From: Doug Barton Organization: Triborough Bridge & Tunnel Authority X-Mailer: Mozilla 4.77 [en] (X11; U; Linux 2.2.12 i386) X-Accept-Language: en MIME-Version: 1.0 To: Peter Wemm Cc: cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh References: <20010604053457.DCFD9380E@overcee.netplex.com.au> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit 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 Peter Wemm wrote: > > 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? I have patches from Eivind to handle cvs merges.... I need to review those and other options, but yes, this is in the works. Doug To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message