Committing and Updating Giving Errors??

[Kahuna]

Having read a bunch of posts on the matter I'm still struggling to get my workspace data into my repository so I can test it from Server / Smart Client.

I tried to Commit and got an error that there are changes, I tried to Update (following some posts from Servoy Support I read - Update, Then Sync, Then Commit), but got errors in Update to.

I can see in the sync window that there are errors where I deleted a bunch of forms and code in my workspace, but I cant so far see how I simply overwrite the contents of the repository with my latest version in workspace? For each of the anomalies in the sync window - how can I say to accept the workspace version? Or where its showing a form that no longer exists - how do I delete it from the registry version?

This seems significantly more complicated than it should be for a single developer (when we don't need a version control tool)!

Would it be easier to simply export the solution and then import it through the Server Admin? Would that update the repository, and allow me to check it out as the latest version for my workspace too?

Any advice appreciated.

[mboegem]

Hi Ian,

don't know if you already read this: http://forum.servoy.com/viewtopic.php?f=38&t=11054
It should help you understand the whole process... you should read the 'B' steps in the post, with focus on B4b...

Some of the things you should keep in mind:
1) Even if you're a developing as single developer, syncing is the best option, as Servoy's application server sometimes will re-order items which will end up as a conflict.
2) Deleting code can indeed end in a conflict. I've been told this is behaviour that only happens when using servoy team provider, SVN doesn't have this.
3) When having a conflict, you have to decide step by step which change is correct and which one isn't. In compare mode you can only READ items from the repository and write them to your workspace.

It took me some time to get confidence in the whole process as well, but it really IS a nice way to sync to the repository.

Good luck!

[Kahuna]

Hi Ian,

don't know if you already read this: http://forum.servoy.com/viewtopic.php?f=38&t=11054
It should help you understand the whole process... you should read the 'B' steps in the post, with focus on B4b...

Some of the things you should keep in mind:
1) Even if you're a developing as single developer, syncing is the best option, as Servoy's application server sometimes will re-order items which will end up as a conflict.
2) Deleting code can indeed end in a conflict. I've been told this is behaviour that only happens when using servoy team provider, SVN doesn't have this.
3) When having a conflict, you have to decide step by step which change is correct and which one isn't. In compare mode you can only READ items from the repository and write them to your workspace.

It took me some time to get confidence in the whole process as well, but it really IS a nice way to sync to the repository.

Good luck!

Thanks for that Marc - took a lot of 'Mark as Merged' to get my workspace ready to commit - but I'm still unsure if all of the forms and obj's I deleted in my solution have been deleted in the repository, or will be thrown back as conflicts again later?

I see how this works for multi-developers but surely there should be a simple way to just force the workspace to replace the repository entries? I know that what is in my workspace is what I want to commit - regardless of what in the repository currently!