I cannot commit the local media folder of my modules, when I have deleted or imported media files. While commiting I get an error dialog. Than I choose “Team → Synchronize”. The objects of the Media folder in the “Team Synchronizing” window can only be updated and not merged or marked as merged and finally commited?! When I press the “update” entry, all my imageMedia and/or rolloverImageMedia on my forms are gone. Is there a way to fix that?
it seems that the images were changed (removed) on the repository, and that is why they are comming as incomming delete (doing on update will remove them from the local repository too)
the commit cannot be done for the medias.obj, that seems to be in conflict, as it was modified on both sides, you should resolve that to be able to commit
All what I do is to remove (delete) and/or import a media object in the “Solution Explorer” and set the media object in the properties on my local machine.
When I have done that and would like to commit the changes to the remote, I get the error! How should I make changes in the media library on the remote? I don’t touch the remote repository and/or files.
I also found the same behaviour, i. e. graphics, in my case in the PNG format, are not updated when a graphic is imported into the solution with the same name as an already existing one (menue: Import media). This used to work without any problem in 3.5.x.
Hope it get’s fixed with the next release, as I found no usable workaround for this and in a solution with modules it’s a real pain.
Regards, Robert
PS: By the way, *.obj in the Preferences menu > Ignored Resources is NOT checked
Servoy Developer 4.1.2
Mac OS 10.4.11
Java™ 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-275)
tgs:
Hello,
I cannot commit the local media folder of my modules, when I have deleted or imported media files. While commiting I get an error dialog. Than I choose “Team → Synchronize”. The objects of the Media folder in the “Team Synchronizing” window can only be updated and not merged or marked as merged and finally commited?! When I press the “update” entry, all my imageMedia and/or rolloverImageMedia on my forms are gone. Is there a way to fix that?