From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from concorde.inria.fr (concorde.inria.fr [192.93.2.39]) by yquem.inria.fr (Postfix) with ESMTP id 28AC2BB81 for ; Fri, 17 Dec 2004 23:27:20 +0100 (CET) Received: from smtp.syd.swiftdsl.com.au (smtp.syd.swiftdsl.com.au [218.214.224.138]) by concorde.inria.fr (8.13.0/8.13.0) with SMTP id iBHMRHEe030690 for ; Fri, 17 Dec 2004 23:27:19 +0100 Received: (qmail 23642 invoked from network); 17 Dec 2004 22:27:20 -0000 Received: from unknown (HELO coltrane.mega-nerd.net) (218.214.64.136) by smtp.syd.swiftdsl.com.au with SMTP; 17 Dec 2004 22:27:20 -0000 Received: from coltrane (localhost [127.0.0.1]) by coltrane.mega-nerd.net (Postfix) with SMTP id 99E187AD7 for ; Sat, 18 Dec 2004 09:27:16 +1100 (EST) Date: Sat, 18 Dec 2004 09:27:16 +1100 From: Erik de Castro Lopo To: caml-list@yquem.inria.fr Subject: Re: [Caml-list] [OT] Rant about VCS Message-Id: <20041218092716.18ca0ed7.ocaml-erikd@mega-nerd.com> In-Reply-To: <20041217213753.GA2295@pegasos> References: <41C3126A.3060101@barettadeit.com> <20041217213753.GA2295@pegasos> Organization: Erik Conspiracy Secret Labs X-Mailer: Sylpheed version 1.0.0beta3 (GTK+ 1.2.10; i386-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Miltered: at concorde with ID 41C35D45.000 by Joe's j-chkmail (http://j-chkmail.ensmp.fr)! X-Spam: no; 0.00; caml-list:01 sven:01 luther:01 sven:01 luther:01 wrote:01 merging:01 cvs:01 merging:01 developement:01 nospam:98 hammer:98 external:02 handles:03 dec:03 X-Spam-Checker-Version: SpamAssassin 3.0.0 (2004-09-13) on yquem.inria.fr X-Spam-Status: No, score=0.1 required=5.0 tests=FORGED_RCVD_HELO autolearn=disabled version=3.0.0 X-Spam-Level: On Fri, 17 Dec 2004 22:37:53 +0100 Sven Luther wrote: > We have had good success with subversion, I looked at subversion before deciding on Arch. The main downside I saw to subversion was that merging across branches was as painful as wil CVS. Arch on the other hand has two powerful merging methods and there is a thrid one on the way. This allows me to run a couple of parallel developement branches, share those that need to be with other external developers and merge acorss the branches pretty much at will. I have not seen another source contol system which handles branches as nicely as Arch. Erik -- +-----------------------------------------------------------+ Erik de Castro Lopo nospam@mega-nerd.com (Yes it's valid) +-----------------------------------------------------------+ "When your hammer is C++, everything begins to look like a thumb." -- Steve Haflich, in comp.lang.c++