Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 05 Nov 1999 19:40:20 +0800
From:      Peter Wemm <peter@netplex.com.au>
To:        Yoshinobu Inoue <shin@nd.net.fujitsu.co.jp>
Cc:        shin@FreeBSD.org, cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Subject:   Re: cvs commit: src/sys - Imported sources 
Message-ID:  <19991105114020.62C2F1C03@overcee.netplex.com.au>
In-Reply-To: Your message of "Fri, 05 Nov 1999 15:26:14 %2B0900." <19991105152614K.shin@nd.net.fujitsu.co.jp> 

next in thread | previous in thread | raw e-mail | index | archive | help
Yoshinobu Inoue wrote:
> > Yoshinobu Inoue wrote:
> > > > >   import KAME SNAP at 19991101 as reference for on-going work.
> 
> I should infrom my another failure.
> 
> Actually I already tried this import in early moring, and
> slept.  The import directory mistakenly included non KAME
> affected dirs (e.g. sys/alpha)
> 
> After I wakeuped, I found (fortunately) the import failed just
> the beginning(in a non KAME related dir). Then I find the
> problem and removed those non KAME related dirs and
> (foolishly) retried import, and caused the disaster.
> 
> So, there is also some files imported at the 1st import which
> is not shown in my import mail.

Thanks a lot for giving me this list, it makes things a lot easier to
sort out.

> C src/sys/Makefile
> cvs server: Importing /home/ncvs/src/sys/alpha
> cvs server: Importing /home/ncvs/src/sys/alpha/alpha
> C src/sys/alpha/alpha/alpha-gdbstub.c
[..]
> C src/sys/alpha/alpha/gensetdefs.c
> 
> All of them confilcted so they didn't affect HEAD branch, but
> the import can be seen via cvsweb and looks strange.
> If possible, I think it is desirable that these files are
> also be replaced to be backuped version.
> (Sorry, to create many problems)
> 
> Yoshinobu Inoue

Don't worry about it too much.  We have all been down this path at some
point or other and learned the hard way that CVS has it's own ideas about
how things are supposed to be.

What is important is knowing when you are getting in too deep and when to
stop and call for help.  Also keeping track of what happened saves a lot of
time if something goes wrong - what you provided was exactly what was
needed and greatly appreciated.

Cheers,
-Peter



To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe cvs-all" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991105114020.62C2F1C03>