Date: Thu, 31 Jan 2008 17:53:23 +0000 From: Tom Evans <tevans.uk@googlemail.com> To: Mike Meyer <mwm@mired.org> Cc: freebsd-hackers@freebsd.org, Adrian Penisoara <ady@freebsd.ady.ro> Subject: Re: [OT] Q: what would you choose for a VCS today Message-ID: <1201802003.2975.10.camel@localhost> In-Reply-To: <20080131110237.06860561@mbook.mired.org> References: <78cb3d3f0801302245v2183c613t6ecdd9acebbe9ef7@mail.gmail.com> <20080131110237.06860561@mbook.mired.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Thu, 2008-01-31 at 11:02 -0500, Mike Meyer wrote: > On Thu, 31 Jan 2008 08:45:55 +0200 "Adrian Penisoara" <ady@freebsd.ady.ro> wrote: > .... Subversion is a close second, but is still a little rough > around the edges. Most notably, merge tracking is in the 1.5 beta > builds, but not in the production code. > > <mike At $JOB, we moved to subversion from CVS about 2-3 years ago. We're still using subversion for everything, and use svnmerge.py [1] to manage development and release branches. It isn't ideal, as you lose information about the individual commits within a merged patchset, which makes it a minor pain to back out a specific commit from a merged patchset. Other features we're looking forward to is read-only slaves that post back commits to a global master site, which would greatly please our North American colleagues, save them from having to pull repos from over the pond. Tom [1] http://www.orcaware.com/svn/wiki/Svnmerge.py [-- Attachment #2 --] -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQBHogsPlcRvFfyds/cRAtIPAKCk3KAR8oqWUTpIKIxP/K9ZQDA84gCfY7Po L/T5veD7qKpxpryp07CxmAc= =FPW6 -----END PGP SIGNATURE-----help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1201802003.2975.10.camel>