SteveKing wrote:
> 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!
I have my reasons, but they're not really relevant here. :P
>
>
>>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.
Nope. Already checked that. svn up show a nice C for it
D:\svn>svn st -u test2
M * 173 test2\file.txt
Status against revision: 174
D:\svn>svn up test2
C test2\file.txt
Updated to revision 174.
(and before you ask, I tried it with "svn up" and "svn up D:\svn\test2"
too: same result)
Note that the file itself IS indeed marked as conflicted, and the
file.txt.mine, file.txt.r173 and file.txt.r174 files are present and
behave as expected.
Thanks for the quick response btw.
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 14:05:46 2004