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

Blank Merge Results

From: Fred Chateau <fchateau_at_comcast.net>
Date: Sun, 25 Nov 2012 22:19:56 -0800 (PST)

We are using WinMerge as our default merge tool, with the following command line switches:

WinMergeU.exe -e -x -ub -dl %bname -dr %yname %base %mine

On several occasions, I have saved a merge, only to discover that the resulting working copy file was entirely empty. However, if I compare changes with the repository copy in WinMerge, it shows file content in both panels.

Let me know if you need more specific details, and thanks in advance for any help you can provide.

Fred Chateau

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3030951

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-11-26 07:30:49 CET

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