[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: Roel Harbers <roel_at_roelharbers.nl>
Date: 2004-09-22 14:30:03 CEST

SteveKing wrote:
>>>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
>
>
> You mentioned that this worked in TSVN < 1.1 - now what Subversion
> client are you using? I hope the RC3 release, if not, try it with that
> one too.
> I checked the code of TSVN and I can't see why it wouldn't show a
> "conflicted" during an update if Subversion really thinks it's
> conflicted.

You are right. I was using 1.0.6.
RC3 shows it as merged:

D:\svn>svn --version
svn, version 1.1.0 (Release Candidate 3)
    compiled Sep 14 2004, 22:19:10
[snip]

D:\svn>svn st -u test2
M * 181 test2\test.txt
Status against revision: 182

D:\svn>svn up test2
G test2\test.txt
Updated to revision 182.

but:

D:\svn>dir test2
  Directory of D:\svn\test2

22-09-2004 14:07 <DIR> .
22-09-2004 14:07 <DIR> ..
22-09-2004 14:07 0 file.txt
22-09-2004 14:07 58 file.txt.mine
22-09-2004 14:07 49 file.txt.r181
22-09-2004 14:07 59 file.txt.r182

Seems indeed to be a svn problem.

> Oh, and don't just assume that if you installed Subversion 1.1.0RC3
> that you're actually using that one. To be sure, do an
> svn --version

Indeed.

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 15:36:03 2004

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