Date: Sat, 13 Nov 2010 23:36:40 -0700 From: Chad Perrin <perrin@apotheon.com> To: freebsd-questions@freebsd.org Subject: Re: Tips for installing windows and freeBSD both.. anyone?? Message-ID: <20101114063640.GB47344@guilt.hydra> In-Reply-To: <AANLkTikSCJK1tEEEDCORt=d-tBURX%2Bv5jbCHDJJdrzgr@mail.gmail.com> References: <201011131848.oADImeTj025257@mail.r-bonomi.com> <AANLkTimMU2A=ZnWMK-mdobnZ=%2B=VcQHtvJ7vGd%2BntnNW@mail.gmail.com> <20101113215340.GB45921@guilt.hydra> <AANLkTikSCJK1tEEEDCORt=d-tBURX%2Bv5jbCHDJJdrzgr@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--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 <perrin@apotheon.com> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20101114063640.GB47344>