On Thu, Jun 22, 2000 at 02:01:34PM +0930, Daniel O'Connor wrote:
>
> On 22-Jun-00 Mike Harding wrote:
> > I have been doing cvsup at least weekly for at long time and this is
> > the first time that this has happened.
>
> Hmm :-/
>
> I guess it could have something to do with the softupdates commit but I doubt
> it..
>
> NFI then really, sorry.
I think it had to do with the latest softupdates commit. My cvsup
from tonight told me that ufs/ffs/*softdep* had conflicts and
that I have to move the existing files out of the way (they were
symlinks to the real sources before the commit).
That was with -current. I think the original mentioned 4.0 sources,
so that might be some kind of cvs problem now that those file exist
as non-symlinks in a different branch.
-Mike
--
Mike Pritchard
[EMAIL PROTECTED] or [EMAIL PROTECTED]
To Unsubscribe: send mail to [EMAIL PROTECTED]
with "unsubscribe freebsd-stable" in the body of the message
