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

Re: [TSVN] result of external merge program not displayed correctly

From: SteveKing <stefankueng_at_gmail.com>
Date: 2004-09-22 12:43:03 CEST

On Wed, 22 Sep 2004 12:24:47 +0200, Roel Harbers <roel@roelharbers.nl> wrote:

> 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.

Wow. My first thought when reading this was: paranoid!

> 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)

You should ask this question on the subversion mailing list. If it is
shown in the progress dialog as merged, then an
svn up
would also show it as merged and not conflicted.

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
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:45:41 2004

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