From owner-freebsd-questions@FreeBSD.ORG Sun Nov 14 06:42:57 2010 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1D571065781 for ; Sun, 14 Nov 2010 06:42:57 +0000 (UTC) (envelope-from perrin@apotheon.com) Received: from cpoproxy1-pub.bluehost.com (cpoproxy1-pub.bluehost.com [69.89.21.11]) by mx1.freebsd.org (Postfix) with SMTP id 77FCF8FC14 for ; Sun, 14 Nov 2010 06:42:57 +0000 (UTC) Received: (qmail 30620 invoked by uid 0); 14 Nov 2010 06:42:56 -0000 Received: from unknown (HELO box543.bluehost.com) (74.220.219.143) by cpoproxy1.bluehost.com with SMTP; 14 Nov 2010 06:42:56 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=apotheon.com; h=Date:From:To:Subject:Message-ID:Mail-Followup-To:References:Mime-Version:Content-Type:Content-Disposition:In-Reply-To:User-Agent:X-Identified-User; b=FmucdRwWL8TlnbRZQptlk1Rfiu3GwGVPFbASuVNy3pgu/AryEznzCjUSjomjtQul1NS8JNd93kkZ46i8IQb2v9vKOMDWV8zGGwx+2EVFcGS0Nrsi/bMljXTdJDK6UiI1; Received: from c-24-8-180-234.hsd1.co.comcast.net ([24.8.180.234] helo=kukaburra.hydra) by box543.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1PHWIh-0007tS-Mk for freebsd-questions@freebsd.org; Sat, 13 Nov 2010 23:42:56 -0700 Received: by kukaburra.hydra (sSMTP sendmail emulation); Sat, 13 Nov 2010 23:36:40 -0700 Date: Sat, 13 Nov 2010 23:36:40 -0700 From: Chad Perrin To: freebsd-questions@freebsd.org Message-ID: <20101114063640.GB47344@guilt.hydra> Mail-Followup-To: freebsd-questions@freebsd.org References: <201011131848.oADImeTj025257@mail.r-bonomi.com> <20101113215340.GB45921@guilt.hydra> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="i9LlY+UWpKt15+FH" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4.2.3i X-Identified-User: {2737:box543.bluehost.com:apotheon:apotheon.org} {sentby:smtp auth 24.8.180.234 authed with ren@apotheon.org} Subject: Re: Tips for installing windows and freeBSD both.. anyone?? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Nov 2010 06:42:57 -0000 --i9LlY+UWpKt15+FH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, Nov 13, 2010 at 06:12:52PM -0800, Rob Farmer wrote: > On Sat, Nov 13, 2010 at 13:53, Chad Perrin wrote: > >> Right, and this isn't a GUI problem - its a problem with combining the > >> documents. What software allows multiple people to open and write to > >> the same file simultaneously without trashing the file or losing data? > > > > Git and Mercurial come to mind. >=20 > I'm not familiar with DVCSes, but I assume they work much the same as > a centralized one - that is they don't open a file and leave it open - > you work on something, then use locking for the actual commit part. > Two people can't edit the same working copy at once, nor can they > commit at exactly the same time. The difference is that locking is > done at the application layer, rather than by the OS itself. Actually, they *don't* work exactly like centralized version control. That's kinda the point; they offer excellent facilities for edit conflict resolution that makes the facilities provided by CVCSes look positively primitive by comparison. DVCSes are specifically designed to facilitate a certain amount of simultaneous development of the same files with generally error-free merging when the second of the two changesets gets added to a given repository. The idea that multiple people can work on the same stuff at the same time is kind of central to the necessary capabilities of a DVCS. --=20 Chad Perrin [ original content licensed OWL: http://owl.apotheon.org ] --i9LlY+UWpKt15+FH Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.14 (FreeBSD) iEYEARECAAYFAkzfg3gACgkQ9mn/Pj01uKWiOgCgiXQs0Clf0wyrY26s8WufaAmR EKYAoMG5v43ZQCSZbqyZI7C9lXzOr0Vv =bf1d -----END PGP SIGNATURE----- --i9LlY+UWpKt15+FH--