Date: Thu, 7 Feb 2002 01:54:07 -0800 From: "Crist J. Clark" <cjc@FreeBSD.ORG> To: "David W. Chapman Jr." <dwcjr@inethouston.net> Cc: Julian Elischer <julian@elischer.org>, Lyndon Nerenberg <lyndon@orthanc.ab.ca>, Emiel Kollof <coolvibe@hackerheaven.org>, current@FreeBSD.ORG Subject: Re: Mergemaster niggle Message-ID: <20020207015407.F2143@blossom.cjclark.org> In-Reply-To: <00b901c1af4a$b1a0a320$d800a8c0@dwcjr>; from dwcjr@inethouston.net on Wed, Feb 06, 2002 at 02:13:08PM -0600 References: <Pine.BSF.4.21.0202061140450.91961-100000@InterJet.elischer.org> <00b901c1af4a$b1a0a320$d800a8c0@dwcjr>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020207015407.F2143>