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

[TSVN] result of external merge program not displayed correctly

From: Roel Harbers <roel_at_roelharbers.nl>
Date: 2004-09-22 12:24:47 CEST

Hi,

I use a special "false.exe" program as external diff3 command: all it
does is return errorcode 1, so that all files that are changed both
locally and on the server fail to merge, and result in a conflict. I can
then use TortoiseMerge to check the merge before actually saving it.

However, when I do an update on a file that has local and remote changes
with tsvn, the file itself is correctly marked as conflicted, but the
SNV Update dialog shows the file as merged successfully, NOT conflicted.

It does not do this when the internal diff3 command is used, and it
didn't do this in previous versions (pre-1.1)

I could send you the false.exe if you want, but all it does is return 1
as errorcode. Is there anything more such a program would need to do?

TSVN v1.1.0.1694 RC2
WinXP Pro SP1

Regards,

Roel Harbers

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Wed Sep 22 13:25:40 2004

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