From owner-freebsd-current@FreeBSD.ORG Fri Nov 9 12:56:51 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 E9CB716A41B for ; Fri, 9 Nov 2007 12:56:51 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.185]) by mx1.freebsd.org (Postfix) with ESMTP id 5C53213C4C4 for ; Fri, 9 Nov 2007 12:56:50 +0000 (UTC) (envelope-from aryeh.friedman@gmail.com) Received: by mu-out-0910.google.com with SMTP id i10so551545mue for ; Fri, 09 Nov 2007 04:56:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:user-agent:mime-version:to:subject:x-enigmail-version:content-type:content-transfer-encoding; bh=H1+mJrmViOmMbRxV/VQC3tLlqTJ8dN9vnyJEQrOT2S0=; b=PZS5vUVx/NxByuSVBbzZykqGFPlyNptB3kfa15bS4u81NRt5nigG9Fkgiz7ZvByMrZxAAKZJEkD3YU5mW+IgmWnZRPqt6PVC5Mkdf+IYDyEk7VT+WUWSfbtZrxihf7KRxLG/eJ4eptTAKuyhTQmSL3QJ+GWpJ8OlKS8NLEq+EtY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:user-agent:mime-version:to:subject:x-enigmail-version:content-type:content-transfer-encoding; b=gVlEwxQYXv375/78HIurEMy1ouH9o+roR8VPzE9WDCaXv0+PGJzYJTHX7LfVo5e0wcpM68HyubTZcOUsfxG4jaUiQLedFkLYe+GI/9CxSI8pAVdN7neLfzvhw5SMv06J2z+ipohrkMUzJoZ25k3IfZePnFCsW4uvkYY4HOJRKeM= Received: by 10.82.167.5 with SMTP id p5mr3477703bue.1194613003181; Fri, 09 Nov 2007 04:56:43 -0800 (PST) Received: from ?192.168.2.2? ( [67.85.89.184]) by mx.google.com with ESMTPS id n3sm917651gvf.2007.11.09.04.56.36 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 09 Nov 2007 04:56:41 -0800 (PST) Message-ID: <4733E878.2050804@gmail.com> Date: Fri, 09 Nov 2007 04:56:24 +0000 From: "Aryeh M. Friedman" User-Agent: Thunderbird 2.0.0.6 (X11/20071109) MIME-Version: 1.0 To: freebsd-current@freebsd.org, freebsd-hackers@freebsd.org X-Enigmail-Version: 0.95.5 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Subject: questions on development(7) 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: Fri, 09 Nov 2007 12:56:52 -0000 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]) 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) 4. Mergemaster behaves strange now: everytime I run it does a buildworld before doing the merge (even if I just did a installworld)... also it seems to default this to /usr/src2 (which is most of the time what I want)... is this normal? and if so how do I turn it off and if I can't how do I set which source tree to use? -- Aryeh M. Friedman Developer, not business, friendly http://www.flosoft-systems.com