From owner-freebsd-current Thu Feb 7 1:57:17 2002 Delivered-To: freebsd-current@freebsd.org Received: from albatross.prod.itd.earthlink.net (albatross.mail.pas.earthlink.net [207.217.120.120]) by hub.freebsd.org (Postfix) with ESMTP id 3D8A537B404 for ; Thu, 7 Feb 2002 01:57:06 -0800 (PST) Received: from dialup-209.245.135.248.dial1.sanjose1.level3.net ([209.245.135.248] helo=blossom.cjclark.org) by albatross.prod.itd.earthlink.net with esmtp (Exim 3.33 #1) id 16YlIP-0002pP-00; Thu, 07 Feb 2002 01:56:53 -0800 Received: (from cjc@localhost) by blossom.cjclark.org (8.11.6/8.11.3) id g179s7j05166; Thu, 7 Feb 2002 01:54:07 -0800 (PST) (envelope-from cjc) Date: Thu, 7 Feb 2002 01:54:07 -0800 From: "Crist J. Clark" To: "David W. Chapman Jr." Cc: Julian Elischer , Lyndon Nerenberg , Emiel Kollof , current@FreeBSD.ORG Subject: Re: Mergemaster niggle Message-ID: <20020207015407.F2143@blossom.cjclark.org> References: <00b901c1af4a$b1a0a320$d800a8c0@dwcjr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i In-Reply-To: <00b901c1af4a$b1a0a320$d800a8c0@dwcjr>; from dwcjr@inethouston.net on Wed, Feb 06, 2002 at 02:13:08PM -0600 X-URL: http://people.freebsd.org/~cjc/ Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, Feb 06, 2002 at 02:13:08PM -0600, David W. Chapman Jr. wrote: > > What I think mergemaster should do is compere the file with the original > > checked out one it claims to be and if it's the same, it should just > > update silently.. i.e. if the user didn't change anything in th old one > > he's unlikely to want to change anything in the new one.... > > > > (maybe a datafile that contains cksum outputs for each version of each > > file) > > > > I think part of the problem(from what I'm hearing on irc), someone made a > lot of commits to etc which weren't supposed to happen, but I cannot confirm > all > the facts at the moment. *Raises hand.* I had a botched cvs(1) command line run away and did some forced commits on /etc files. You would only have seen it if you updated over a few hour stretch; the Repo Lords fixed it. You lucked out and must have updated during the window. ;) Note that if you look at your diff, the revision number went _backwards._ -- Crist J. Clark | cjclark@alum.mit.edu | cjclark@jhu.edu http://people.freebsd.org/~cjc/ | cjc@freebsd.org To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message