Chris Angelico <ros...@gmail.com>: > On Sun, Jan 3, 2016 at 11:33 AM, Marko Rauhamaa <ma...@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 -- https://mail.python.org/mailman/listinfo/python-list
