From owner-freebsd-hackers@FreeBSD.ORG Fri Feb 1 22:35:00 2008 Return-Path: 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 806E616A421 for ; Fri, 1 Feb 2008 22:35:00 +0000 (UTC) (envelope-from ady@ady.ro) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.238]) by mx1.freebsd.org (Postfix) with ESMTP id 438F413C45A for ; Fri, 1 Feb 2008 22:35:00 +0000 (UTC) (envelope-from ady@ady.ro) Received: by wx-out-0506.google.com with SMTP id i29so1207932wxd.7 for ; Fri, 01 Feb 2008 14:34:59 -0800 (PST) Received: by 10.142.180.17 with SMTP id c17mr2611399wff.144.1201905298330; Fri, 01 Feb 2008 14:34:58 -0800 (PST) Received: by 10.143.167.6 with HTTP; Fri, 1 Feb 2008 14:34:58 -0800 (PST) Message-ID: <78cb3d3f0802011434p5bed2b1ex39320962f0bc8bf5@mail.gmail.com> Date: Sat, 2 Feb 2008 00:34:58 +0200 From: "Adrian Penisoara" Sender: ady@ady.ro To: "Mike Meyer" In-Reply-To: <20080131110237.06860561@mbook.mired.org> MIME-Version: 1.0 References: <78cb3d3f0801302245v2183c613t6ecdd9acebbe9ef7@mail.gmail.com> <20080131110237.06860561@mbook.mired.org> X-Google-Sender-Auth: 22d096248eea8d47 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: freebsd-hackers@freebsd.org Subject: Re: [OT] Q: what would you choose for a VCS today X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2008 22:35:00 -0000 Hi, On Jan 31, 2008 6:02 PM, Mike Meyer wrote: > On Thu, 31 Jan 2008 08:45:55 +0200 "Adrian Penisoara" > wrote: > > Side-topic, if you bear with me: if you were to choose again what to > use > > as source revision control system (VCS) from today's offerings, what > would > > you choose to maintain FreeBSD's sources or a side-off project tracking > > FreeBSD as base that would allow better teams cooperation and easy code > > merging between projects/branches ? > > Pretty much any post-CVS VCS will do that. But if you want a good > merge facility, Perforce's are - well, after getting used to them, > everything else feels like throwing your code against the wall and > hoping the right parts stick. I talked to one of the git developers > about a year ago, and they were thinking about adding a guided merge > inspired by what Perforce does. > > I do trust you on Perforce being a strong contender for the job, but, unfortunately, looking at their licensing terms for OSS projects I do get some second thoughts. Perhaps that's why FreeBSD did not migrate mainstream sources over to P4 yet ;)... Thanks, Adrian Penisoara ROFUG / EnterpriseBSD