From owner-freebsd-current@FreeBSD.ORG Wed Jul 22 09:28:05 2009 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 22583106564A for ; Wed, 22 Jul 2009 09:28:05 +0000 (UTC) (envelope-from bf1783@googlemail.com) Received: from mail-bw0-f219.google.com (mail-bw0-f219.google.com [209.85.218.219]) by mx1.freebsd.org (Postfix) with ESMTP id 9B3538FC15 for ; Wed, 22 Jul 2009 09:28:04 +0000 (UTC) (envelope-from bf1783@googlemail.com) Received: by bwz19 with SMTP id 19so53029bwz.43 for ; Wed, 22 Jul 2009 02:28:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=z2RK4iq0/mQD3BBue0VKwyjkMzRPiEjggQo/keQM7mg=; b=YPfokTex04Son1eSIu5ANJxYHimCJnK5ewBYWtKdJdsvowjl92NLSpBVf7089Iv8nu xxie1k6E2OMd8/C9ANhNGy7+a9/eF6CbvBjfgeeXYcL5GR7FzycPoTsE0LrpvFadrRWa eCLX9Tm5EJa8Lp3jHaUrA1P/jRuzbVlwRQNe0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type:content-transfer-encoding; b=XxDizzDor7MyXd6IxXWeynhVa99NjQK5WeskvmoXj5unP7yncQ42MzQugOn57cr/gs cTEwkgxWo0WusgICssRx6FibGJeNn3VB3OJ6Un40ZR5WAMB/5fJvYhxqblMSjsoXG/LM 9Bv8RxgijUMH7hW49Xdm2yfcWagM1ntnZ7A9o= MIME-Version: 1.0 Received: by 10.239.142.3 with SMTP id e3mr72961hba.101.1248254883346; Wed, 22 Jul 2009 02:28:03 -0700 (PDT) In-Reply-To: <4A66D587.9060001@haruhiism.net> References: <4A66CFFC.30601@doghouserepair.com> <11167f520907220200m5dd456dfs2ad53d4b579b851b@mail.gmail.com> <4A66D587.9060001@haruhiism.net> Date: Wed, 22 Jul 2009 09:28:03 +0000 Message-ID: From: "b. f." To: Kamigishi Rei Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: "Sam Fourman Jr." , Ryan Rogers , FreeBSD Current Subject: Re: nfe problem on 8.0-BETA2 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2009 09:28:05 -0000 If you are using csup in checkout mode, then you could use a date= ... corresponding to the day prior to the problem commit (see csup(1) ), rather than the usual tag=. , but then you would lose the good changes after that point -- and there have been many. Or, even better, you could place a pattern corresponding to the file that caused the problem in your refuse file, and update that file by hand independently of the rest of your sources, which you would continue to csup. If you are using csup in cvs mode rather than checkout mode then you could use any number of workarounds. But I agree with K. Rei -- subversion is better. Install devel/subversion, and then checkout the sources: svn co svn://svn.freebsd.org/base/head svn merge -c -193289 Thereafter, in the root of the repo: svn up svn merge b. On 7/22/09, Kamigishi Rei wrote: > Sam Fourman Jr. wrote: >> what do I have to put in my cvs-supfile to get my src tree to have all >> updates up to r193288? >> I have never done that before. atm my src is -CURRENT as of like a hour >> ago. >> > > In such cases it's advised that you use Subversion > (/usr/ports/devel/subversion-freebsd) instead of cvsup. > -- > Kamigishi Rei > KREI-RIPE >