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

Re: allowing multiple conflicts in storage

From: Julian Foad <julian.foad_at_wandisco.com>
Date: Wed, 31 Mar 2010 21:41:04 +0100

Stefan Sperling wrote:
> On Wed, Mar 31, 2010 at 07:34:41PM +0100, Julian Foad wrote:
> > OK I've attached a patch with ideas and suggestions. (The above was
> > meant to be a concept that should be embodied in the design, not a
> > design in itself.)
>
> I like it, please commit!

Done in r929709, excluding a couple of the queries which Greg cleared up
for me on IRC.

- Julian

> > In my dream world, the logic of "update" is
> > handled in the client layer as a sibling of "merge".
>
> I also like your dream world :)
>
> Stefan
Received on 2010-03-31 22:41:37 CEST

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