From owner-freebsd-current@FreeBSD.ORG Fri Nov 9 14:20:21 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 1BE2F16A46E; Fri, 9 Nov 2007 14:20:21 +0000 (UTC) (envelope-from root@kash.tomsk.ru) Received: from mx.kash.tomsk.ru (ns2.kash.tomsk.ru [88.204.35.2]) by mx1.freebsd.org (Postfix) with ESMTP id 8118613C4AC; Fri, 9 Nov 2007 14:20:19 +0000 (UTC) (envelope-from root@kash.tomsk.ru) Received: by mx.kash.tomsk.ru (Postfix, from userid 0) id 9A13CDAD03; Fri, 9 Nov 2007 20:20:08 +0600 (NOVT) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by mx.kash.tomsk.ru (Postfix) with ESMTP id 1ED0ADACF3 for ; Fri, 9 Nov 2007 20:20:06 +0600 (NOVT) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 7FAF71A372; Fri, 9 Nov 2007 14:18:55 +0000 (UTC) (envelope-from owner-freebsd-hackers@freebsd.org) Received: from hub.freebsd.org (localhost [127.0.0.1]) by hub.freebsd.org (Postfix) with ESMTP id D36DB16A4E9; Fri, 9 Nov 2007 14:18:52 +0000 (UTC) (envelope-from owner-freebsd-hackers@freebsd.org) Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DB3516A469 for ; Fri, 9 Nov 2007 13:56:22 +0000 (UTC) (envelope-from ianf@clue.co.za) Received: from munchkin.clue.co.za (munchkin.clue.co.za [66.219.59.160]) by mx1.freebsd.org (Postfix) with ESMTP id 38D2413C4BA for ; Fri, 9 Nov 2007 13:56:22 +0000 (UTC) (envelope-from ianf@clue.co.za) DomainKey-Signature: a=rsa-sha1; q=dns; c=simple; s=20070313; d=clue.co.za; h=Received:Received:Received:To:cc:From:Subject:In-Reply-To:X-Attribution:Date:Message-Id; b=il4xyv3lTDYyQXf2mNqNw+soltsAfUJ/qKl6aYh5+SvViTPIBJrhVKt658H93i9/h6fx8RA8kdfwdG1geYltQBIsC0mTsQjtjGlsuh12RBXix8toBT3pfUjdbPihbEwDiuJICsmQ9qk4BjawpiHzgxTQKfM5xsX7Jd4PoSHWp1RL4g5+Any6jENbRzgJiW+CUVfMOoSknTWH7Cd78J1TYLhqgUq8dfs9ZEEYmgXk9Mo1E7V6J5VkOelPO6zGIv10; Received: from uucp by munchkin.clue.co.za with local-rmail (Exim 4.67) (envelope-from ) id 1IqTxv-0005PR-V9; Fri, 09 Nov 2007 13:32:07 +0000 Received: from ianf.clue.co.za ([10.0.0.6] helo=clue.co.za) by urchin.clue.co.za with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.66) (envelope-from ) id 1IqTxq-0004rS-NX; Fri, 09 Nov 2007 13:32:02 +0000 Received: from localhost ([127.0.0.1] helo=clue.co.za) by clue.co.za with esmtp (Exim 4.68 (FreeBSD)) (envelope-from ) id 1IqTxn-0001He-La; Fri, 09 Nov 2007 15:31:59 +0200 To: "Aryeh M. Friedman" From: Ian FREISLICH In-Reply-To: Message from "Aryeh M. Friedman" of "Fri, 09 Nov 2007 04:56:24 GMT." <4733E878.2050804@gmail.com> X-Attribution: BOFH Date: Fri, 09 Nov 2007 15:31:59 +0200 Message-Id: X-Mailman-Approved-At: Fri, 09 Nov 2007 14:18:43 +0000 X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Sender: owner-freebsd-hackers@freebsd.org Errors-To: owner-freebsd-hackers@freebsd.org X-DSPAM-Result: Innocent X-DSPAM-Processed: Fri Nov 9 20:20:08 2007 X-DSPAM-Confidence: 0.9947 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 47346c98284381299911919 X-DSPAM-Factors: 27, freebsd, 0.00321, freebsd, 0.00321, Sender*owner+freebsd, 0.00329, Sender*freebsd, 0.00329, List-Post*freebsd, 0.00329, List-Post* List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Nov 2007 14:20:21 -0000 "Aryeh M. Friedman" wrote: > First of all I am posting to both -current and -hackers because > -hackers seems to be very low volume. > > I just set up a master server development server using the procedure > in development(7) which was fairly clear but left a few questions > unanswered (and one odd behavior). I have only the master server (no > clients). Just for ref my dir tree looks like this: > > /home/ncvs ---> /FreeBSD/CVSROOT > /FreeBSD/7.x (src) > /FreeBSD/current (src ports doc) > /usr/src ---> /FreeBSD/7.x > /usr/src2 ---> /FreeBSD/current > /usr/ports ---> /FreeBSD/current/ports > /usr/obj is on it's own partition > > My questions: > > 1. If I am modifing code and such should I have a local branch? > 2. If yes to #1 how do I setup keeping everything except my modified > code in sync (and if possible to retro activally apply patchs from the > local branch unto the main source tree [/usr/src2]) You won't be able to commit to the BSD repo from your server. I think you should treat your repo as read only and use cvsup to keep it up to date. At least that's what I do. > 3. The documentation said very little about how to generate patchs > between my local code and the main branch > a. Ideally I want to set it up where when I am done with a > modification it automatically creates a patch (I have never used CVS > for anything except through csup and cvsup so I am totally lost here) 'cvs diff' will generate a patch for the specified files or directories. Some like context diffs, I like unified with minimal context '-ud' option to diff. Use whichever you find easier to read. Submit patches in whatever format the developers prefer. Unified seems the most common format around here. Ian -- Ian Freislich _______________________________________________ freebsd-hackers@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-hackers To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.org"