From owner-freebsd-newbies@FreeBSD.ORG Wed Mar 23 15:57:19 2005 Return-Path: Delivered-To: freebsd-newbies@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9423E16A4CE for ; Wed, 23 Mar 2005 15:57:19 +0000 (GMT) Received: from pd4mo1so.prod.shaw.ca (shawidc-mo1.cg.shawcable.net [24.71.223.10]) by mx1.FreeBSD.org (Postfix) with ESMTP id 291C643D1D for ; Wed, 23 Mar 2005 15:57:19 +0000 (GMT) (envelope-from flowers@users.sourceforge.net) Received: from pd4mr3so.prod.shaw.ca (pd4mr3so-qfe3.prod.shaw.ca [10.0.141.214]) by l-daemon (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with ESMTP id <0IDT00KMXAZIIE40@l-daemon> for freebsd-newbies@freebsd.org; Wed, 23 Mar 2005 08:57:18 -0700 (MST) Received: from pn2ml4so.prod.shaw.ca ([10.0.121.148]) by pd4mr3so.prod.shaw.ca (Sun ONE Messaging Server 6.0 HotFix 1.01 (built Mar 15 2004)) with ESMTP id <0IDT0008GAZIUH60@pd4mr3so.prod.shaw.ca> for freebsd-newbies@freebsd.org; Wed, 23 Mar 2005 08:57:18 -0700 (MST) Received: from procyon.nekulturny.org (S01060010a72631f9.cg.shawcable.net [68.144.46.209]) by l-daemon (iPlanet Messaging Server 5.2 HotFix 1.18 (built Jul 28 2003)) with ESMTP id <0IDT00A7NAZIUJ@l-daemon> for freebsd-newbies@freebsd.org; Wed, 23 Mar 2005 08:57:18 -0700 (MST) Date: Wed, 23 Mar 2005 08:57:18 -0700 From: Danny MacMillan In-reply-to: <20050319085157.GA15510@gothmog.gr> To: Giorgos Keramidas Message-id: <20050323155718.GA818@procyon.nekulturny.org> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-disposition: inline References: <20050318165206.57372.qmail@harmony.digitalbluesky.net> <25309.65.243.45.100.1111167332.squirrel@webmail.rossillo.net> <20050318174517.57545.qmail@harmony.digitalbluesky.net> <20050319085157.GA15510@gothmog.gr> User-Agent: Mutt/1.5.6i cc: Scott Rossillo cc: steve cc: freebsd-newbies@freebsd.org Subject: Re: Using CVS for a project on a 5.3 box X-BeenThere: freebsd-newbies@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Gathering place for new users List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Mar 2005 15:57:19 -0000 On Sat, Mar 19, 2005 at 10:51:58AM +0200, Giorgos Keramidas wrote: > On 2005-03-18 12:45, steve wrote: > > I believe I will be using CVS in it's most simple sense. Myself and > > the few other people working on my project will either SSH under their > > own accounts to the box and edit project files there, or "check them > > out" I guess and ftp them to a windows box, edit them, ftp them back > > and "commit" them after SSH'ing in again. > > You can check out from a Windows box directly. WinCVS works fine for > this purpose. It's setup and making it use an SSH key is always a bit > confusing for me, but that's because of my little experience with > Windows software. It can be done though... Just a note -- I've used all the Windows GUI CVS clients and the only one I'd recommend is Tortoise CVS. It's the no-contest cock of the walk in my opinion. http://www.tortoisecvs.org It doesn't come with a difference editor, but you can plug one in. I highly recommend Araxis Merge. It's not free, but it's worth paying for. I've never seen its equal. http://www.araxis.com/merge/index.html -- Danny