Date: Mon, 4 Jun 2001 08:48:45 +0200 From: Eivind Eklund <eivind@FreeBSD.org> To: Doug Barton <DougB@DougBarton.net> Cc: Peter Wemm <peter@wemm.org>, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org Subject: Re: cvs commit: src/usr.sbin/mergemaster mergemaster.sh Message-ID: <20010604084845.A89346@FreeBSD.org> In-Reply-To: <3B1B23C7.8158812@DougBarton.net>; from DougB@DougBarton.net on Sun, Jun 03, 2001 at 10:59:35PM -0700 References: <20010604053457.DCFD9380E@overcee.netplex.com.au> <3B1B23C7.8158812@DougBarton.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Jun 03, 2001 at 10:59:35PM -0700, Doug Barton wrote: > 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. Actually, those patches do not handle full 3-way merges with cvs - they use cvs to find unchanged files, which significantly decrease the amount of work with updating. I'm planning to implement 3-way merges using cvs once the present set of patches are committed; I wanted to minimize the size of the first set of patches in order to make it simple to review and commit. Eivind. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010604084845.A89346>