[Svnmerge] How does SVN handle merging renamed / moved filesfrom "branches"

[Raman Gupta]

Resending to list (sorry Auke)...

Auke Jilderda wrote:
> Renzo, Eric,
> 
> that slide deck was the initial summary in which we identified a set  
> of troubled use cases we encountered in a certain class of tree  
> conflicts.  You'll be happy to know that work is underway for  
> Subversion to reliably and consistently (a) signal those conflicts,  
> (b) raise the conflicts persistently in the working copy, and (c)  
> handle things automatically where possible.  The topic is tracked in  
> issue 2282 [1] and the implementation work is underway in the  
> "tree-conflicts" branch in the Subversion repository [2].

In an earlier message I mistakenly stated that I thought this was
going to be part of svn 1.5... based on the "1.6-consider" in the
issue target milestone, it looks like that was misinformation. Sorry
about that.

Cheers,
Raman Gupta


-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/x-pkcs7-signature
Size: 3515 bytes
Desc: S/MIME Cryptographic Signature
URL: </pipermail/svnmerge/attachments/20080206/0b1dee69/attachment-0002.bin>