From owner-freebsd-current@FreeBSD.ORG  Fri Nov  9 13:40:47 2007
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
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 9D53416A46E
	for <freebsd-current@freebsd.org>; Fri,  9 Nov 2007 13:40:47 +0000 (UTC)
	(envelope-from anderson@freebsd.org)
Received: from ns.trinitel.com (186.161.36.72.static.reverse.ltdomains.com
	[72.36.161.186])
	by mx1.freebsd.org (Postfix) with ESMTP id 05BE113C4A3
	for <freebsd-current@freebsd.org>; Fri,  9 Nov 2007 13:40:46 +0000 (UTC)
	(envelope-from anderson@freebsd.org)
Received: from proton.storspeed.com (209-163-168-124.static.twtelecom.net
	[209.163.168.124]) (authenticated bits=0)
	by ns.trinitel.com (8.14.1/8.14.1) with ESMTP id lA9DeTGi000416;
	Fri, 9 Nov 2007 07:40:30 -0600 (CST)
	(envelope-from anderson@freebsd.org)
Message-Id: <AF4CB6DD-F81C-4E5B-9DDB-3959A0D2C75B@freebsd.org>
From: Eric Anderson <anderson@freebsd.org>
To: "Aryeh M. Friedman" <aryeh.friedman@gmail.com>
In-Reply-To: <4733F1DA.60706@gmail.com>
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Mime-Version: 1.0 (Apple Message framework v912)
Date: Fri, 9 Nov 2007 07:40:30 -0600
References: <E1IqTxn-0001He-La@clue.co.za> <4733F1DA.60706@gmail.com>
X-Mailer: Apple Mail (2.912)
X-Spam-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00 autolearn=ham
	version=3.1.8
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on ns.trinitel.com
Cc: freebsd-hackers@freebsd.org, Ian FREISLICH <ianf@clue.co.za>,
	freebsd-current@freebsd.org
Subject: Re: 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
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 09 Nov 2007 13:40:47 -0000


On Nov 8, 2007, at 11:36 PM, Aryeh M. Friedman wrote:

>
>>>
>>> 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.
>
> What I meant was how do I keep from clobbering my local changes?


If you keep a local repo, and checkout from the local repo, then your  
checkout will merge the changes (unless there are conflicts).


Eric