From owner-freebsd-stable@FreeBSD.ORG Wed Apr 30 19:15:06 2003 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E70C837B401; Wed, 30 Apr 2003 19:15:06 -0700 (PDT) Received: from warez.scriptkiddie.org (uswest-dsl-142-38.cortland.com [209.162.142.38]) by mx1.FreeBSD.org (Postfix) with ESMTP id 33D8843F3F; Wed, 30 Apr 2003 19:15:02 -0700 (PDT) (envelope-from lamont@scriptkiddie.org) Received: from [192.168.69.11] (unknown [192.168.69.11]) by warez.scriptkiddie.org (Postfix) with ESMTP id 5B55F62D1A; Wed, 30 Apr 2003 19:14:59 -0700 (PDT) Date: Wed, 30 Apr 2003 19:14:59 -0700 (PDT) From: Lamont Granquist To: Doug Barton In-Reply-To: <20030420151937.V631@znfgre.tberna.bet> Message-ID: <20030430190355.D5470@coredump.scriptkiddie.org> References: <004901c30780$5347d250$0200a8c0@travel> <20030420151937.V631@znfgre.tberna.bet> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Anton Zavrin cc: freebsd-stable@freebsd.org Subject: RE: mergemaster tips X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 May 2003 02:15:07 -0000 Is there any way to get mergemaster to automagically 'i'nstall over files that you haven't touched without any user intervention? I guess the problem here is that mergemaster is only designed to have access to the currently checked out copy of /usr/src/etc, so it doesn't know what state the file 'should' be in, is that correct? What'd be really nice would be if mergemaster could automagically merge the changes that you've made on the system with the changes from the previous CVS version. Obviously you could get a conflict and have to manually merge the changes, but in a lot of cases this could probably be minimized... ... Could you have mergemaster save copies of the pristine /usr/src/etc files locally on the system somewhere (in /var?) when it finishes? Then use that the next time it runs to figure out more stuff that it can do automagically? On Sun, 20 Apr 2003, Doug Barton wrote: > On Sun, 20 Apr 2003, Anton Zavrin wrote: > > I don't understand what is written in man pages about mergemaster, > > that's the thing... > > Ok, can you give me an example of something that you don't understand? I > tried to be quite thorough in the man page, but if people don't understand > it, it's not doing its job. > > > But thanks for the tip anyway, that was a good one ;-) > > Glad to help. > > Doug > > -- > > This .signature sanitized for your protection > _______________________________________________ > freebsd-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-stable > To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" >