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

Re: Tree Conflicts with Subversion 1.7

From: Daniel Shahaf <d.s_at_daniel.shahaf.name>
Date: Thu, 18 Aug 2011 22:09:00 +0300

Stein Somers wrote on Thu, Aug 18, 2011 at 20:41:44 +0200:
> On 18-Aug-11 19:05, Daniel Shahaf wrote:
> >What copyfrom would the single directory have, in the case of an add/add
> >conflict?
>
> The same as if you resolve an add/add file conflict by manually
> throwing the two file contents into one file: you may wish a double
> copyfrom, to trace back to both origins later. I bet our beloved SVN
> developers are not eager to support multiple copyfroms, so at most
> one of them gets the honor.

You don't sound like you care to have a technical discussion about the
problems that multiple copyfrom would introduce v. would solve.
Received on 2011-08-18 21:09:42 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.