From owner-freebsd-questions@FreeBSD.ORG Sun Nov 14 02:12:53 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 91F4F106564A for ; Sun, 14 Nov 2010 02:12:53 +0000 (UTC) (envelope-from rfarmer@predatorlabs.net) Received: from mail-vw0-f54.google.com (mail-vw0-f54.google.com [209.85.212.54]) by mx1.freebsd.org (Postfix) with ESMTP id 5792A8FC14 for ; Sun, 14 Nov 2010 02:12:52 +0000 (UTC) Received: by vws20 with SMTP id 20so1376311vws.13 for ; Sat, 13 Nov 2010 18:12:52 -0800 (PST) MIME-Version: 1.0 Received: by 10.220.187.13 with SMTP id cu13mr939219vcb.97.1289700772439; Sat, 13 Nov 2010 18:12:52 -0800 (PST) Received: by 10.220.16.199 with HTTP; Sat, 13 Nov 2010 18:12:52 -0800 (PST) X-Originating-IP: [128.95.133.113] In-Reply-To: <20101113215340.GB45921@guilt.hydra> References: <201011131848.oADImeTj025257@mail.r-bonomi.com> <20101113215340.GB45921@guilt.hydra> Date: Sat, 13 Nov 2010 18:12:52 -0800 Message-ID: From: Rob Farmer To: freebsd-questions@freebsd.org Content-Type: text/plain; charset=ISO-8859-1 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 02:12:53 -0000 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. 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. -- Rob Farmer