Is Merge / Import Accurate?

Classic Servoy
1

Hi Folks - I’ve researched some of the threads from the past regarding merging of solutions / repository’s using the export / import methods.

Back in the 04’s it seemed there were some real problems where multiple developers had erroneous results in merges, I didn’t find much of more recent vintage. At that time Patrick stood-out as identifying a number of the potential pitfalls of the merge process.

In 3.5.1 are there still challenges getting accuracy in merges?

I just need the occasional merge between my software developer’s PC and my review environment (also a Servoy Developer) - and it’ll be form / element, and Method level changes from both ends.

I think the multi-developer server is too involved a response to what we need as we don’t have a requirement for checking in / out portions of the development, and I’d like to keep it as simple as possible (merging seems to fill that bill).

Any feedback on the state of merging currently would be appreciated.

Another related question revolves around any data exported with the solution. Is that data then squirted into the dataServer when its eventually imported to the slave / master? If not then how can that be retrieved and appended to the dataServer tables.

Cheers

2

Import/Export is such basic functionality that Servoy will make sure it works as expected. Flaws like this are solved asap.
I have not seen the issue using the latest release.

Importing data is not really meant to move data around although it is possible. It is therefor named ‘sample data’.

When no server with the same name available it will ask you which server should be used.
When no tables are available they will be created.
When no data available it will be inserted.

The last one is important! When data available NO data will be inserted.

Hope this helps

3

Excellent response and support as always Marcel! That’s exactly what I wanted to hear!

Cheers