Eclipse Team Issues

Classic Servoy
1

We’ve had some issues with our team approach for development with Eclipse/Servoy 4.0.

Basically, we’ve noticed that some work we’ve done locally and committed to the server has suddenly been overwritten after doing a commit and then an update.

What are we doing wrong?

We have 3 developers accessing the same server from different areas and time zones.

Here’s the typical approach a developer will make.

Originally, a solution is checked out at workspace setup.
Changes are made locally.
Developer does a commit (to send local changes to the server)
if conflicts, we do a synchronize and compare and update
Developer does an update (to get any changes from the server)

We’re a bunch of Eclipse newbies… so can anyone provide some expertise?

Chico

2

If you, in case of conflicts do as you describe here, the local changes are never send to the Repository Server:

if conflicts, we do a synchronize and compare and update
Developer does an update (to get any changes from the server)

Only commit ever updates the central repository!

In case of conflicts, you need to run a sync, then compare the differences and decide how you want to proceed. You can either overwrite your local changes by copying individual changes from the central repo to your local workspace, or update your local workspace with all changes from the central repo or call “Mark as Merged” on your local changes (marking them as leading in the commit process) and then call commit.

Because you marked local changes as merged, in case of a conflict, the local changes in your workspace will be leading and overwrite the conflicting changes on the repository server.

Hope this helps,

Paul

3

Paul,

When we do the synchronize, we ARE going through the conflicts and choosing to override OR mark as merged.

And then we commit.

So we’re at a loss as to what we’re doing wrong.

4

What are the changes you commit and get overwritten?
Form/elements/JS (solution related), security related, or database information related files?

You are using Servoy Team provider, right? I know of a similar problem that happened with security related files.

5

One time, it was a modification to a method that seemed to get reverted.

Another time, I had modified several columns in several tables on my database connections (turning on the UUID Flag on several columns)

6

You say it was 3 developers working on the same team repository.
Are you sure someone else didn’t commit a new version (that reverted the initial changes) of your method/columns between the commit and the update in question?

If this isn’t the case, please try to find a reproducible scenario on a small sample solution - so we can have a look - and file a case to the support system:

Thanks.