Thomas Börkel wrote:
> Is this now reproducable for you with my repro steps below?
Yes it is. I used file:/// access and the result is the same.
Changes from the repository have been merged into an unmodified local
file. The merge progress dialog says that the file is updated when in
fact it is merged. It should be possible to do a diff from this dialog,
but because the status is shown incorrectly it is not allowed.
Slightly simplified recipe below:
>> Here are the exact repro steps:
>> - create directory "C:\tsvnrepro"
>> - create FSFS repository there
>> - create folder "/test1" in repos (repo browser)
>> - checkout "test1"
>> - create text file "test.txt" in local folder "test1" with one line
>> of text
>> - add "test.txt" to repository and commit
>> - in Repo-Browser, copy "/test1" to "/test2"
>> - add another line of text to "test1/test.txt" and commit
>> - checkout "test2"
>> - merge from "/test1/test.txt", rev 2 to rev 4 (To = Use From URL)
>> into working copy test2/test.txt
>> - after-merge dialog says "Update", but Windows Explorer shows "!"
>> (correctly), because the 2nd line of text was added to
>> "test2/test.txt"
Simon
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Nov 24 10:37:11 2004