Re: TSVN 1.6.9-x64: Diff and Merge no longer working in Update window?

On 02.07.2010 11:05, Andreas Tscharner wrote:
> Hello World,
>
> I updated my working copy and a lot of files had been changed on the server. So I had a conflict and a few merges.
> I double-clicked on the conflict line and nothing happened, so I tried the "Edit conflict..." on the popup menu, but nothing here either. So I tried the merged files. If i double-clicked on them, the diff tool was started, but when I selected the same on the popup menu, again nothing happened.
>
> System: Windows 7 Professional, 64 Bit (on a i7-920 (quad) and 4GiB RAM)
> TortoiseSVN: official TortoiseSVN-1.6.9-x64 (r19725)
> Diff Tool: Beyond Compare 3 ("C:\Program Files (x86)\Tools\Beyond Compare 3\BComp.exe" /fv="Text Compare" "%base" "%mine")
> Merge Tool: Beyond Compare 3 ("C:\Program Files (x86)\Tools\Beyond Compare 3\BComp.exe" /fv="Text Merge" /automerge /title1="Base"/title2="Mine" /title3="Theirs" /title4="Merged" "%base" "%mine" "%theirs" "%merged")
>
> Is this a general bug or just me?

Does this happen too if you switch back to TortoiseMerge as your
diff/merge tool?
What kind of conflict is it? Use the Check-For-Modifications dialog and
show both 'text status' and 'property status' column. If it's a property
conflict, then BC might not be able to deal with it.
If it's a tree conflict, no diff/merge tool can resolve that kind of
conflict but you have to do it yourself.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2628929
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].