[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Andreas Tscharner <andreas.tscharner_at_metromec.ch>
Date: Fri, 2 Jul 2010 11:05:17 +0200

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?

Best regards
Wenzel Metromec AG
        Andreas Tscharner

-- 
Andreas Tscharner, Development
Wenzel Metromec AG, Rheinfelsstrasse 1, CH-7007 Chur, Switzerland
phone:          +41 (0)81 257 07 00
fax:            +41 (0)81 257 07 01
e-mail:         mailto:andreas.tscharner_at_metromec.ch 
www:            http://www.metromec.ch
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2628584
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-07-02 11:16:26 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.