Repository merge issue

Classic Servoy
1

Hello, we just tested the merging while importing solutions into the repository and observed the following:

  1. the repository database was an exact duplicate on both machines
  2. on machine 1 we put a button on form a, on machine 2 we put a button on form b
  3. machine 1 exported the solution
  4. we imported the solution on machine 2

5a. when we choose “merge / use import version” we had a button on form a but no button on form b

5b. when we chose “merge / use local version” we had a button on form a (mixed with something that wasn’t there anymore in solution 1) and a button on form b; the result was not exactly what was in solution 1 but “merged” from both solutions on that one form a ( a new button was added, but something that was removed in solution 1 was still there)?!

As far as I understand “merging”, in this constellation there should be no difference in methods since there is no conflict on either of the forms. That leads to the question: what is a conflict? A differing form, or object by object?

Am I misunderstanding something? Or better: If two developers develop on different forms (the only proper way?) how should they go about merging their work.

Servoy 2.0.4

Thanks

2

What do you mean the repositories where exact duplicates? Did you copy it on the database level? Because in that way version tracking will not work.

The only way to properly work together on a database is to always make sure the ONLY way you transfer solutions between repositories is via import/export. There is revision information in the repository that loses its meaning when you duplicate a solution on the database level.

3

What I meant was this:

We started development on machine 1. Then we installed machine 2 and copied the databases (repository plus data) from machine 1 to machine 2 on database level. After that both started working with Servoy.

Is that what you mean should not be done? If not, I didn’t understand how Servoy could notice…

4

That’s exactly what I mean should not be done.

If you need the solution in the other repository it should be exported/imported.

The data can of course be copied on the database level, that is no problem.
Although then the sequences should be synchronized (using the admin page).