From owner-freebsd-current@FreeBSD.ORG Fri Nov 9 15:35:23 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 A976B16A418; Fri, 9 Nov 2007 15:35:23 +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 EA37D13C4A3; Fri, 9 Nov 2007 15:35:21 +0000 (UTC) (envelope-from root@kash.tomsk.ru) Received: by mx.kash.tomsk.ru (Postfix, from userid 0) id 8EC62DAD03; Fri, 9 Nov 2007 21:35:08 +0600 (NOVT) Received: from mx2.freebsd.org (mx2.freebsd.org [69.147.83.53]) by mx.kash.tomsk.ru (Postfix) with ESMTP id 151D3DACF2 for ; Fri, 9 Nov 2007 21:35:07 +0600 (NOVT) Received: from hub.freebsd.org (hub.freebsd.org [IPv6:2001:4f8:fff6::36]) by mx2.freebsd.org (Postfix) with ESMTP id 03B11BCAB0; Fri, 9 Nov 2007 15:34:24 +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 1820A16A571; Fri, 9 Nov 2007 15:34:22 +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 28E4216A418; Fri, 9 Nov 2007 15:24:27 +0000 (UTC) (envelope-from jamesh@lanl.gov) Received: from mailwasher.lanl.gov (mailwasher.lanl.gov [204.121.3.2]) by mx1.freebsd.org (Postfix) with ESMTP id B853813C48D; Fri, 9 Nov 2007 15:24:26 +0000 (UTC) (envelope-from jamesh@lanl.gov) Received: from mailrelay1.lanl.gov (mailrelay1.lanl.gov [128.165.4.101]) by mailwasher.lanl.gov (8.13.8/8.13.8/(ccn-5)) with ESMTP id lA9FB6ON030451; Fri, 9 Nov 2007 08:11:06 -0700 Received: from oppie-mail.lanl.gov (oppie-mail.lanl.gov [128.165.4.123]) by mailrelay1.lanl.gov (8.13.8/8.13.8/(ccn-5)) with ESMTP id lA9FB5TL001693; Fri, 9 Nov 2007 08:11:05 -0700 Received: from [128.165.86.10] (secretariat.lanl.gov [128.165.86.10]) by oppie-mail.lanl.gov (Postfix) with ESMTP id 795531F8002; Fri, 9 Nov 2007 08:11:00 -0700 (MST) From: James To: "Aryeh M. Friedman" In-Reply-To: <4733F476.9030008@gmail.com> References: <4733F1DA.60706@gmail.com> <4733F476.9030008@gmail.com> Organization: Los Alamos National Laboratories Date: Fri, 09 Nov 2007 08:11:00 -0700 Message-Id: <1194621060.80662.5.camel@secretariat.lanl.gov> Mime-Version: 1.0 X-Mailer: Evolution 2.10.3 FreeBSD GNOME Team Port X-CTN-5-MailScanner-Information: Please see http://network.lanl.gov/email/virus-scan.php X-CTN-5-MailScanner: Found to be clean X-CTN-5-MailScanner-From: jamesh@lanl.gov X-Spam-Status: No X-Mailman-Approved-At: Fri, 09 Nov 2007 15:34:17 +0000 Content-Type: text/plain Content-Transfer-Encoding: 7bit X-Content-Filtered-By: Mailman/MimeDel 2.1.5 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 21:35:08 2007 X-DSPAM-Confidence: 0.9949 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 47347e2c284386917814499 X-DSPAM-Factors: 27, freebsd, 0.00305, freebsd, 0.00305, Sender*owner+freebsd, 0.00312, Sender*freebsd, 0.00312, List-Post*freebsd, 0.00312, List-Post*, freebsd-current@freebsd.org Subject: Re: questions on development(7) X-BeenThere: freebsd-current@freebsd.org Reply-To: jamesh@lanl.gov 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 15:35:23 -0000 On Fri, 2007-11-09 at 05:47 +0000, Aryeh M. Friedman wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > > > > > > > If you keep a local repo, and checkout from the local repo, then > > your checkout will merge the changes (unless there are conflicts). > > Thanks the fact I know the answer you gave is quite simple but > completely over my head shows I need a good tutorial on cvs where can > I find one ;-) > O'Reilly released a good book a while back that has a free version online: http://cvsbook.red-bean.com/ _______________________________________________ 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"