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

Re: [TSVN] Unresolved conflicts and Update

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-07-08 17:53:37 CEST

Rob Davies wrote:

[snip]
> The problem is that it allows the update, but doesn't modify the
> <filename>.mine file that is still in existence from the previous
> update. As a result, the .mine file shows code prior to any changes you
> made since the first update, and can result in code loss if you click
> "Save" before realising.

If that's really true (that the update still works and the .mine file
isn't modified) then it's definitely a Subversion issue. TSVN doesn't do
anything on its own when updating/committing/...

> Would it be possible to have TortoiseSVN refuse the update of an
> unresolved file, or update the .mine file to the current state of the
> file (potential dangerous, former would likely be a better idea).

No. Unfortunately, TSVN can't interfere with the Subversion API calls -
there just isn't such a callback/option/... in that API to do that.

> Anyone else encountered this? Just occurred to me that this could be a
> Subversion problem rather than a Tortoise one, but I'll post this anyway
> in case anyone has any (helpful! :)) suggestions.

Could you please try this with the command line client and then report
this to the subversion mailing list? (users@subversion.tigris.org).

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Jul 8 19:00:36 2004

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