From owner-freebsd-current@FreeBSD.ORG Tue Nov 27 18:05:14 2007 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 34E9116A417 for ; Tue, 27 Nov 2007 18:05:14 +0000 (UTC) (envelope-from julian@elischer.org) Received: from outM.internet-mail-service.net (outM.internet-mail-service.net [216.240.47.236]) by mx1.freebsd.org (Postfix) with ESMTP id 1A8B613C469 for ; Tue, 27 Nov 2007 18:05:13 +0000 (UTC) (envelope-from julian@elischer.org) Received: from mx0.idiom.com (HELO idiom.com) (216.240.32.160) by out.internet-mail-service.net (qpsmtpd/0.40) with ESMTP; Tue, 27 Nov 2007 10:05:12 -0800 X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e X-Client-Authorized: MaGic Cook1e Received: from julian-mac.elischer.org (nat.ironport.com [63.251.108.100]) by idiom.com (Postfix) with ESMTP id 10CE4126AFC; Tue, 27 Nov 2007 10:05:12 -0800 (PST) Message-ID: <474C5C53.10203@elischer.org> Date: Tue, 27 Nov 2007 10:05:07 -0800 From: Julian Elischer User-Agent: Thunderbird 2.0.0.9 (Macintosh/20071031) MIME-Version: 1.0 To: Scott Long References: <474C28C1.4000204@gmail.com> <474C2B01.7060305@gmail.com> <474C380E.3010903@samsco.org> In-Reply-To: <474C380E.3010903@samsco.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: freebsd-current@freebsd.org, "Aryeh M. Friedman" Subject: Re: bypassing certain cvs commits 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: Tue, 27 Nov 2007 18:05:14 -0000 Scott Long wrote: > Aryeh M. Friedman wrote: >> -----BEGIN PGP SIGNED MESSAGE----- >> Hash: SHA1 >> >> Eygene Ryabinkin wrote: >>> Tue, Nov 27, 2007 at 09:25:05AM -0500, Aryeh M. Friedman wrote: >>>> As per my detailed comments to Jason >>>> http://lists.freebsd.org/pipermail/cvs-src/2007-November/084307.html >>>> is broken but I want to update everything else how do I by pass the >>>> ref'ed commit? >>> Grab the diff and revert if by hand after CVSup? May require some >>> manual merging, but it will require merge in any case if later >>> commits go to the top of the changes you want to revert. >> I am using a local repo >> > > Then use CVS to check out the exact rev of those files that you want. > That'll make the rev be sticky in your tree, so it won't change the next > time you update. Note that I would consider it rather rude and > condescending to instruct a senior developer like Jason on how to do > backouts instead of giving him help in identifying and maybe fixing the > problems. and to check out the head MINUS a change use cvs update -j e.g. to remove the change that was used to make 1.4 but leave the changes that went into 1.5 and later you can do cvs up -A x.c # check out the latest. cvs up -j1.4 -j1.3 x.c #back out the change that differentiated 1.4 from 1.3 > > Scott > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"