From owner-freebsd-hackers@FreeBSD.ORG Fri Feb 1 22:48:47 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 2884016A419 for ; Fri, 1 Feb 2008 22:48:47 +0000 (UTC) (envelope-from mwm-keyword-freebsdhackers2.e313df@mired.org) Received: from mired.org (bhuda.mired.org [66.92.153.74]) by mx1.freebsd.org (Postfix) with SMTP id B689313C478 for ; Fri, 1 Feb 2008 22:48:46 +0000 (UTC) (envelope-from mwm-keyword-freebsdhackers2.e313df@mired.org) Received: (qmail 95172 invoked by uid 1001); 1 Feb 2008 22:48:52 -0000 Received: from bhuda.mired.org (localhost.localdomain [127.0.0.1]) by bhuda.mired.org (tmda-ofmipd) with ESMTP; Fri, 01 Feb 2008 17:48:51 -0500 Date: Fri, 1 Feb 2008 17:48:50 -0500 To: freebsd-hackers@freebsd.org Message-ID: <20080201174850.54fb9dab@bhuda.mired.org> In-Reply-To: <78cb3d3f0802011434p5bed2b1ex39320962f0bc8bf5@mail.gmail.com> References: <78cb3d3f0801302245v2183c613t6ecdd9acebbe9ef7@mail.gmail.com> <20080131110237.06860561@mbook.mired.org> <78cb3d3f0802011434p5bed2b1ex39320962f0bc8bf5@mail.gmail.com> Organization: Meyer Consulting X-Mailer: Claws Mail 2.9.1 (GTK+ 2.10.12; amd64-portbld-freebsd6.2) Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAG1BMVEXguIzRkGnhyaz069mXhW0WHRnbrnR9WCQ6LB0CchNMAAACSUlEQVQ4jV2TQW7jMAxFGaPQOgQEdZaGMsgBrAvUA03dCxj1Uu4U2gfwQD7AGNax51NK07RcxXz6/CSl0Ij450vkPG1jzpIZM1UwDCl/xB14TWnNX8A00Qj5a0mnVFVbVUz4MeErea2HikSRqZzY894zwg9p2+/AtO8LzxFED+tNAUFeU29iFOLRxlZAcdo9A8wi8ZBMV4BKPde82Oxrvs6BTkulQIClte0DLFzzsKk9j1MBex8iUaP00Bd78S/muyFScrTXz6zLkEUxJp+SabQfNOs4f4Jpx5qSZ/304PWwlEWP1cOn/mJQR7EOD+uKhjcBLziuL7xoY5Xm+VFAUSw/LwwwsHEHxihpwV4EJH0xXRkbw1PkRw+X4pEuSJwBggqk+HEYKkiL5/74/nQkogigzQsAFrakxZyfw3wMIEEZPv4AWMfxwqE5GNxGaERjmH+PG8AE0L4/w9g0lsp1raLYAN5azQa+AOoO9NwcpFkTrG2VKNMNEL5UKUUAw34tha0z7onUG0oBoNtczE04GwFE3wCHc0ChezAJ6A1WMV81AtY7wDAJSlXwV+4cwBvsOsrQMRawfQEBz0deEZ7WNpV2szckIKo5VpDHDSDvF1GItwqqAlG01Hh50BGtVhuUkjkasg/14bYFGCgWg1fSWHvmOoJck2xdp9ZvZBHzDVTzX23TkrOn7qe5U2COEw5D4Vx3qEQpFY2Z/3QFnJxzp7YCmSMG19nOUoe869zZfOQb5ywQuWu0yCn5+8gxZz+BE7vG3j4/wbf4D/sXN9Wug1s7AAAAAElFTkSuQmCC Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Delivery-Agent: TMDA/1.1.11 (Ladyburn) From: Mike Meyer 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:48:47 -0000 On Sat, 2 Feb 2008 00:34:58 +0200 "Adrian Penisoara" wrote: > 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 ;)... I've found the folks at Perforce to be very amenable to reasonable approaches. One of the founders is a strong FreeBSD advocate (IIRC, he once said "Linux is cool. FreeBSD is double-plus cool."), and I suspect they'd love to have the main FreeBSD repository on Perforce. If the only thing preventing that was their OSS license terms, I'd be surprised if they wouldn't at least consider relaxing them for FreeBSD. http://www.mired.org/consulting.html Independent Network/Unix/Perforce consultant, email for more information.