Lorenz wrote:
>Stefan Küng wrote:
>>Maybe your working copy is slightly corrupt?
>^[...]
>
>I checked out a new working copy of the branch and copied the modified
>files from the old wc.
>The problem does not show.
>
>next I copied the .svn folder from the new wc to the old wc, assuming
>that there should be no difference.
>Now the problem is gone in the old wc too.
>[...]
>
>If I can make some more time to play, I will try to determine the
>differences between the to .svn folders.
I found a difference in the .svn/entries file.
the <entry ...> for the file showing the problem with 1.3.3 has
conflict-wrk=, conflict-new= and conflict-old members.
Must have deleted the confict files manually instead of using the
resolved command, back when I touched this wc the last time.
Is there a warning to do so anywhere that I overlooked?
The only other real difference is the "repos=" member of the directory
entry.
So the fact that TSVN 1.3.3 has issues with this wc and TSVN 1.3.2 has
not seems not to be a bug of 1.3.3 but a feature of 1.3.2 8-)
If TSVN 1.3.3 now looks for the confict-... entries instead for the
confict files, then there also should the resolved command in the
context menu be available for the affected file.
I will check that after having updated again.
Lorenz
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Tue Apr 11 09:11:12 2006