[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 13:40:31 CEST

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

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

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 14:45:44 2004

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