Path: csiph.com!eternal-september.org!feeder.eternal-september.org!mx02.eternal-september.org!.POSTED!not-for-mail
From: Marko Rauhamaa <marko@pacujo.net>
Newsgroups: comp.lang.python
Subject: Re: We will be moving to GitHub
Date: Sun, 03 Jan 2016 03:14:30 +0200
Organization: A noiseless patient Spider
Lines: 32
Message-ID: <87vb7bzcp5.fsf@elektro.pacujo.net>
References: <n66kmg$ig$1@ger.gmane.org> <CAPTjJmq1Qevy7h4pqrQPobLRO-_ooLrXsZhK9Z9YCKPyFnxKsQ@mail.gmail.com> <CAKJDb-MFM6i+MMZXcPkV6x-rFnKr9Yxt4f3ne1dF3dk_SkoFpw@mail.gmail.com> <mailman.146.1451678991.11925.python-list@python.org> <5687718d$0$1612$c3e8da3$5496439d@news.astraweb.com> <87oad41fd4.fsf@elektro.pacujo.net> <mailman.158.1451730569.11925.python-list@python.org> <87k2ns1b0d.fsf@elektro.pacujo.net> <mailman.159.1451734854.11925.python-list@python.org> <87ege012i5.fsf@elektro.pacujo.net> <mailman.165.1451745521.11925.python-list@python.org> <87a8oo11b4.fsf@elektro.pacujo.net> <mailman.167.1451747904.11925.python-list@python.org> <8737uf1oyx.fsf@elektro.pacujo.net> <mailman.188.1451781733.11925.python-list@python.org>
Mime-Version: 1.0
Content-Type: text/plain
Injection-Info: mx02.eternal-september.org; posting-host="b7cb1518d23ec19d482dcc9c31d30fdd"; logging-data="18963"; mail-complaints-to="abuse@eternal-september.org";	posting-account="U2FsdGVkX1/4CnpNLYgJTxQY9TCC7Sxd"
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)
Cancel-Lock: sha1:QpaRVp6mak0vYbb8LXKDdMhVO24= sha1:fdMuktRyFvLX4uH8hcWows6MKR4=
Xref: csiph.com comp.lang.python:101181

Chris Angelico <rosuav@gmail.com>:

> On Sun, Jan 3, 2016 at 11:33 AM, Marko Rauhamaa <marko@pacujo.net> wrote:
>> Teamware didn't have to pick any of them since Teamware's commits
>> were done per individual files. The repository didn't have a commit
>> history.
>>
>> Thus, Teamware was equivalent to Hg/Git with each file treated as an
>> independent repository.
>
> And what if you and someone else edit different parts of the same
> file? How is that handled? Why should the top and bottom of one file
> be dramatically different from two separate files?

Files are a natural unit of granularity; that's why we don't place all
source code in a single source code file.

There are exceptions, but in general I'd say only one person should be
editing one file at any given time.

As I mentioned before, Darcs tries to eat the cake and have it, too. It
provides Git-like repository semantics and a clearly defined concept of
parallel changes. It does *not* make a distinction between two files and
two parts of a file.

Unfortunately, rumor has it that Darcs can run into serious performance
issues as it enforces the conceptual purity. That's why I think
Teamware's file-level focus is the practical sweet spot of distributed
version control.


Marko