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
Crist J. Clark                     |     [EMAIL PROTECTED]
                                   |     [EMAIL PROTECTED]
http://people.freebsd.org/~cjc/    |     [EMAIL PROTECTED]

To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-current" in the body of the message

Reply via email to