Stefan Küng wrote:
>Lorenz wrote:
>> Hi All,
>>
>> I think I have a problem with the check for modifications dialog since
>> I upgraded to 1.3.3.
>> Well, I'm not really sure that the problem I see is new, but I can't
>> check because I don't have the 1.3.2 installer any more, and it's no
>> longer available on the download page.
>>
>> The problem I see is that the check for modifications dialog shows one
>> of the files in one of my working copies in bright read (meaning:
>> "Items modified locally and deleted in repository, or modified in
>> repository and deleted locally").
>> The file is only modified locally, but not deleted in the repository,
>> so ... ?
>
>What does the status column tell you? The icon is only a 'quick' view,
>the real status is shown in the columns of the check-for-modifications
>dialog.
>
>> When I double-click on the file in the dialog, the 3-pane TMerge is
>> launched, trying to open <file>.merge-right.rXYZ in the left and
>> <file>.working in the right panel, which both don't exist.
>
>That would indicate a status of 'conflicted'.
>You can also see the status if you right-click on the file in the
>explorer, choose "properties" and then go to the Subversion tab.
>
>Also, please specify which icon exactly you mean here. The icon overlay
>shown on the file icons?
>
>Stefan
let me rephrase and summarise my two posts:
I have a freshly created private branch and a working copy based upon
(checked out from) it. The working copy has some minor modifications,
but no merges (so no conficts), and no commits to the branch have been
done so far.
With TSVN 1.3.2 everything works as expected.
After upgrading to TSVN 1.3.3 the "check for modifications" dialog
then displayed one (but not all) of the modified files in bright red,
and a double click launched TMerge in three pane view.
This was the point where I asked for a link to the 1.3.2 installer.
I then downgraded to TSVN 1.3.2 and the "check for modifications" and
"commit dialogs worked as expected again.
I have done a clean install (uninstall + reboot) of 1.3.3 before
downgrading, but that didn't change things.
I don't remember what the status column showed with 1.3.3 because what
triggered my post happened in the "check for modification" dialog, but
there are no conflict files in the working copy, and I remember that I
could "diff agains base" from the context menu.
Please let me know if you still need the requested informations.
I'm back to 1.3.2 in the moment, so I would need to install 1.3.3
again.
Lorenz
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Mon Apr 10 09:05:27 2006