[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: [OT] Conflict, an open source project

From: Dennis Byrne <dennisbyrne_at_apache.org>
Date: 2007-08-29 04:22:49 CEST

Well, thanks for "taking the gloves off", Ben and Malcolm. I went and did
it anyways [1], so time will tell if people find this useful :)

[1] http://conflict.sourceforge.net

Dennis Byrne

On 8/3/07, Malcolm Rowe <malcolm-svn-dev@farside.org.uk> wrote:
>
> On Thu, Aug 02, 2007 at 04:33:06PM -0500, Ben Collins-Sussman wrote:
> > The feature seems to be motivated by a deep desire to avoid
> > out-of-dateness (and conflicts) at all costs; but this sort of goes
> > against the whole philosophy of the copy-modify-merge model. So what
>
> (and it's worth mentioning that file-level locks don't help at all with
> the kind of semantic 'conflicts' that occur e.g. when someone else's
> refactoring renames a function that you depended upon in your current
> wc).
>
> Regards,
> Malcolm
>
>

-- 
Dennis Byrne
Received on Wed Aug 29 04:20:23 2007

This is an archived mail posted to the Subversion Dev mailing list.