From owner-freebsd-stable Wed Nov 15 14:23:53 2000 Delivered-To: freebsd-stable@freebsd.org Received: from fledge.watson.org (fledge.watson.org [204.156.12.50]) by hub.freebsd.org (Postfix) with ESMTP id C258337B4C5 for ; Wed, 15 Nov 2000 14:23:48 -0800 (PST) Received: from localhost (doug@localhost) by fledge.watson.org (8.9.3/8.9.3) with SMTP id RAA48476; Wed, 15 Nov 2000 17:22:28 -0500 (EST) (envelope-from doug@safeport.com) X-Authentication-Warning: fledge.watson.org: doug owned process doing -bs Date: Wed, 15 Nov 2000 17:22:27 -0500 (EST) From: Doug Denault X-Sender: doug@fledge.watson.org To: Doug Barton Cc: Francisco Reyes , FreeBSD stable Subject: Re: mergemaster wishlist In-Reply-To: Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG An awesome piece of work. I have but two wishes, saving one for later :) 1) a log 2) an option that says in effect overwrite all the files I did not modify. My reasons for wanting (2) are I was updating a 4.1 system I had just installed from the CD to 4.2-BETA and nothing really had changed, certainly not the periodic scripts and defaults. I have not looked at this enough to have an opinion on how to determine/tag "unmodified" files. Editing something in the file would be fine with me. The log would serve to address an "oop's. On Wed, 23 Aug 2000, Doug Barton wrote: > On Tue, 22 Aug 2000, Francisco Reyes wrote: > > > On Thu, 17 Aug 2000 23:53:51 -0700, Doug Barton wrote: > > > > > Yes, thanks. This is close to the top of the wishlist. > > > > > > Where is the wishlist for mergemaster? > > Is it kept anywhere visible? > > Define visible. :) I have a project list of things that people > have asked for that I plan to include. It's not very long, but see below. > > > I have one thing I have been thinking on giving it a try in a > > few weeks. > > Changing mergemaster to indicate files to be either ignored or > > copied. Kind of an exception file. > > Haven't looked at the code so I don't know how difficult it > > would be. > [cut] > > > To Unsubscribe: send mail to majordomo@FreeBSD.org > with "unsubscribe freebsd-stable" in the body of the message > To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message