From owner-freebsd-current@FreeBSD.ORG Fri Nov 9 14:08:04 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 F406116A46E; Fri, 9 Nov 2007 14:08:03 +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 331F213C480; Fri, 9 Nov 2007 14:08:03 +0000 (UTC) (envelope-from root@kash.tomsk.ru) Received: by mx.kash.tomsk.ru (Postfix, from userid 0) id BDB54DAD14; Fri, 9 Nov 2007 20:07:50 +0600 (NOVT) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by mx.kash.tomsk.ru (Postfix) with ESMTP id 5BC7EDACFE for ; Fri, 9 Nov 2007 20:07:47 +0600 (NOVT) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id E12CABB977; Fri, 9 Nov 2007 14:06:59 +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 700AC16A421; Fri, 9 Nov 2007 14:06:59 +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 BBA5D16A41A for ; Fri, 9 Nov 2007 14:06: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 6B7C313C4AA for ; Fri, 9 Nov 2007 14:06:47 +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: From: Eric Anderson To: "Aryeh M. Friedman" 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: <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 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:07:50 2007 X-DSPAM-Confidence: 0.9949 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 473469b6284383158719242 X-DSPAM-Factors: 27, Nov, 0.00137, freebsd, 0.00325, freebsd, 0.00325, Sender*owner+freebsd, 0.00333, Sender*freebsd, 0.00333, List-Post*freebsd, 0.00333, List-Post*>+>>, 0.00410, Received*freebsd, 0.00566, Received*freebsd, 0.00566, Cc*freebsd, 0.00648, Cc*freebsd, 0.00648, mailing, 0.00660, mailing+list, 0.00664, Received*hub.freebsd.org, 0.00681, Received*hub.freebsd.org, 0.00681, Received*(hub.freebsd.org, 0.00681, Received*4f8, 0.00681, Received*4f8, 0.00681, Received*mx2.freebsd.org, 0.00681, Received*mx2.freebsd.org, 0.00681, Received*from+hub.freebsd.org, 0.00681 Cc: freebsd-hackers@freebsd.org, Ian FREISLICH , freebsd-current@freebsd.org Subject: Re: questions on development(7) X-BeenThere: freebsd-current@freebsd.org 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 14:08:04 -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 _______________________________________________ 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"