From owner-cvs-all  Thu Nov  4 21:38:44 1999
Delivered-To: cvs-all@freebsd.org
Received: from galilei.v6.hitachi.co.jp (galilei.v6.hitachi.co.jp [133.145.167.4])
	by hub.freebsd.org (Postfix) with ESMTP
	id 7872E1518D; Thu,  4 Nov 1999 21:38:39 -0800 (PST)
	(envelope-from sumikawa@ebina.hitachi.co.jp)
Received: from prince.net.ebina.hitachi.co.jp (prince.net.ebina.hitachi.co.jp [172.16.105.69])
	by galilei.v6.hitachi.co.jp (8.9.3/3.7W) with ESMTP id OAA09719;
	Fri, 5 Nov 1999 14:37:23 +0900 (JST)
Received: from localhost (localhost [127.0.0.1])
	by prince.net.ebina.hitachi.co.jp (8.9.3/3.7W) with ESMTP id FAA25494;
	Fri, 5 Nov 1999 05:37:23 GMT
To: shin@nd.net.fujitsu.co.jp
Cc: peter@netplex.com.au, shin@FreeBSD.org,
	cvs-committers@FreeBSD.org, cvs-all@FreeBSD.org
Cc: sumikawa@ebina.hitachi.co.jp
Subject: Re: cvs commit: src/sys - Imported sources 
In-Reply-To: <19991105140645Q.shin@nd.net.fujitsu.co.jp>
References: <199911050427.UAA95099@freefall.freebsd.org>
	<19991105044327.1151A1CC6@overcee.netplex.com.au>
	<19991105140645Q.shin@nd.net.fujitsu.co.jp>
X-Mailer: xcite1.31> Mew version 1.94 on Emacs 20.4 / Mule 4.0 (HANANOEN)
Mime-Version: 1.0
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-Id: <19991105143723B.sumikawa@ebina.hitachi.co.jp>
Date: Fri, 05 Nov 1999 14:37:23 +0900 (JST)
From: SUMIKAWA Munechika (=?ISO-2022-JP?B?GyRCM1FAbj0hNmEbKEI=?=) <sumikawa@ebina.hitachi.co.jp>
X-Dispatcher: imput version 990905(IM130)
Lines: 25
Sender: owner-cvs-all@FreeBSD.ORG
Precedence: bulk

shin> .....
shin> I just can say terribly sorry for my stubid import mistake.
shin> .....
shin> I'm not sure what is the best way to resolve this, but if
shin> there is backup of repository near before, can replace to it?
shin> (If committers until now has their own backup)

I think we have three choices.

1. restore the tree from backup.

   If backup is made recently, I think it is the best way.

2. back-commit for some files influence on HEAD branch

   Since most of files are conflicted fotunatelly, few of files are
   applied to HEAD branch automatically. We can easily back-commit
   them. we can use vendor-tag as reference.

3. make avoid confliction and merge KAME into HEAD branch.

   It's rough solution, but final goal.

---
Munechika SUMIKAWA @ KAME Project


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