Re: Tree Conflicts with Subversion 1.7

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.

To be accurate, the first add/add resolution strategy has three subplots:
  - put all files in the same directory ("Markus Schaber's strategy")
    - and pretend it's a copy from local
    - and pretend it's a copy from incoming
    - and pretend it's brand new

In any case, even if there was an automatic add/add resolution for directories,
it's still possible to have an add/add conflict of a directory versus a file,
and I dare Markus to come up with an automatic resolution for that...

-- 
Stein