Thank you Stefan; I'll give it a try. And thanks for the great tool.
Donald.
Stefan Küng wrote:
> Donald H Locker wrote:
>> I haven't seen any responses to this query and wonder if maybe it's
>> just me. I don't mind the failing, of course, it's the silence that
>> bothers me.
>>
>> Thanks again,
>> Donald.
>>
>> TortoiseSVN 1.4.5.10425, Windoze 2k and XP
>> Merging a binary file leaves file conflicted. (This I expect)
>>
>> If destination file is read-write, selecting "Resolve conflict using
>> theirs"
>> succeeds as expected. Conflict is resolved and "theirs" replaced "mine."
>>
>> If destination file is read-only, selecting "Resolve conflict using
>> theirs"
>> leaves original file in place, still read-only, with no indication that
>> anything unusual happened.
>
> This should work correctly in the latest nightly build from trunk.
>
> Stefan
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Nov 13 20:58:15 2007