On Wed, Jan 17, 2007 at 08:38:34AM +0000, Ciaran McCreesh wrote: > | The other points were valid, but if it works anything like Gentoo, I > | think this is BS. Sure, everyone commits to the same tree, but not to > | the same lines of the same file. Unless all they do over in BSD-land > | is global seds all day long, I don't see this scenario. > You mean like when eight or so archs keyword something for a security > bug within a few hours of each other? Or when three or four archs go > stable with a new KDE or Gnome release on the same day? You get conflicts with CVS already in that case, it's not going to increase the number of conflicts in any way.
As a different note, if we were so inclined GIT would actually allow us to specify that the KEYWORDS line is safe to perform additive merges on always - I wouldn't trust such a behavior myself, but the option is there. -- Robin Hugh Johnson Gentoo Linux Developer E-Mail : [EMAIL PROTECTED] GnuPG FP : 11AC BA4F 4778 E3F6 E4ED F38E B27B 944E 3488 4E85
pgpS9OmbZBAH6.pgp
Description: PGP signature
