Amit Chugh wrote:
>>> In version 1.5.3 whenever a conflict occurs and I click on the
>>> RESOLVED command it gives me the sharing violation error and nothing
>>> happens i.e. I am not able to resolve the conflict. I have set my EDIT
>>> CONFLICT preferences to use Araxis Merge (I thought this might be
>>> helpful).
>> I can't reproduce this here. I've tried with WinMerge (not Araxis
>> Merge), but that works ok too.
>>
>> Is the file in question maybe still open in another application?
>>
> This is still a problem for me. This problem started happening since
> v1.5.x and happens on ALL v1.5.x versions. The problem also happens
> even when I try to use Out-Of-Box merge tool that comes with
> TortoiseSVN.
>
> I even right clicked on the files and choose UNLOCKER http://ccollomb.free.fr/unlocker/
> (the free tool that will list the applications putting the locks on
> files) and it showed no locks.
What is the exact error message you get?
(Ctrl-C on the message box copies the full text to the clipboard, you
don't have to write it down manually)
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest Interface to (Sub)Version Control
/_/ \_\ http://tortoisesvn.net
Received on 2008-10-02 20:55:11 CEST