From owner-freebsd-hackers@FreeBSD.ORG Thu Jan 29 14:22:17 2004 Return-Path: Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2330F16A4CE for ; Thu, 29 Jan 2004 14:22:17 -0800 (PST) Received: from mail5.speakeasy.net (mail5.speakeasy.net [216.254.0.205]) by mx1.FreeBSD.org (Postfix) with ESMTP id 44CF743D1F for ; Thu, 29 Jan 2004 14:22:01 -0800 (PST) (envelope-from jhb@FreeBSD.org) Received: (qmail 4770 invoked from network); 29 Jan 2004 22:22:00 -0000 Received: from dsl027-160-063.atl1.dsl.speakeasy.net (HELO server.baldwin.cx) ([216.27.160.63]) (envelope-sender ) encrypted SMTP for ; 29 Jan 2004 22:22:00 -0000 Received: from 10.50.40.205 (gw1.twc.weather.com [216.133.140.1]) by server.baldwin.cx (8.12.10/8.12.10) with ESMTP id i0TMLvM0071022; Thu, 29 Jan 2004 17:21:57 -0500 (EST) (envelope-from jhb@FreeBSD.org) From: John Baldwin To: "Bjoern A. Zeeb" , FreeBSD hackers mailing list Date: Thu, 29 Jan 2004 15:59:54 -0500 User-Agent: KMail/1.5.4 References: In-Reply-To: MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200401291559.54624.jhb@FreeBSD.org> X-Spam-Checker-Version: SpamAssassin 2.55 (1.174.2.19-2003-05-19-exp) Subject: Re: SCM - local tree ? X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 29 Jan 2004 22:22:17 -0000 On Thursday 29 January 2004 03:49 pm, Bjoern A. Zeeb wrote: > Hi, > > how do you all sync your "local tree" with HEAD ? > How do you store your changes locally ? cvs ? directory of patches ? > > Up to now I have copied a clean src and applied my patchset. This way > I always have a clean src and a working copy here. But apart from the > IO when copying I do not feel too lucky with this solution. > > Some best practice examples - or did I miss an article ? I always cvsup the entire repo rather than just a checkout of src and then use cvs to checkout /usr/src from my repo on all my boxes. As long as the changes are simple, cvs will merge changes in w/o any major problems. For bigger projects I have been using branches in the FreeBSD p4 depot to maintain changes for the past few years. p4 does a much better job than CVS of mergning in changes from HEAD into my work branches as well as letting me merge things between work branches. -- John Baldwin <>< http://www.FreeBSD.org/~jhb/ "Power Users Use the Power to Serve" = http://www.FreeBSD.org