Date: Fri, 05 Nov 1999 14:37:23 +0900 (JST) From: SUMIKAWA Munechika (=?ISO-2022-JP?B?GyRCM1FAbj0hNmEbKEI=?=) <sumikawa@ebina.hitachi.co.jp> To: shin@nd.net.fujitsu.co.jp Cc: sumikawa@ebina.hitachi.co.jp Subject: Re: cvs commit: src/sys - Imported sources Message-ID: <19991105143723B.sumikawa@ebina.hitachi.co.jp> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19991105143723B.sumikawa>