[TSVN] Unresolved conflicts and Update

I haven't managed to find anything on this in the list archive,
so either it ain't there or I'm plugging in the wrong keywords. :]

There seems to be a problem with TortoiseSVN (v1.0.6 build 1200)
regarding Updating a file that is currently marked as "Conflicted".

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.

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

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.

Thanks,

Rob.

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