Re: Merging an altered and renamed file

Matthew wrote:
> What did I do:
> I was trying to merge a branch with my working copy ( trunk ).
> Branch :
> - Edited one file (file1.txt) and renamed it to file2.txt in 1 commit
> WC :
> - Edited the same file (file1.txt), different text of course and even a
> different location of edit.
>
> What happened:
> When merging these two, it simply adds file2.txt to the result, but neglects the
> changes made in my current working copy. Because the rename and changes were
> done in 1 commit, I cannot merge just the change.
>
> What I Expected:
> - The changes in file1.txt were first checked against eachother and in case of a
> conflict, conflicthanding (as normal) is expected. And then the result should
> have been file2.txt.

This is rather a corner case, so it is not entirely obvious what
subversion should do. In any event, you would need to ask this question
on the subversion users list as it is the svn library rather than TSVN
which is doing the actual merging here.

Simon

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org