Merging Solutions - Not Straight Forward?

Hi Folks.

As a stand-alone developer I find I often need to move my development solution between two or even three PC’s (some times not network connected). This has proven a challenge in the past and I’ve adopted the route of completely deleting the solution on the pc I want to import to, prior to importing the updated solution.

Whilst working with another developer (where we were both working on stand-alone developments of the same solution) we decided to merge the two versions with the following results (assuming we have version A and B):

Export Version A on PC1

PC2 > Servoy Admin > Import (include data and select merge with solution B - use repository version ‘solution B’ where conflict).

This resulted in Solution B being visible with no Solution A content visible.

Next Step:

Delete current solution B including contents.

Close, reopen developer > Checkout Solution again

This resulted in only the imported solution A contents being visible.

Next Step:

Re-import the original Solution B with Merge selected

Delete solution including contents and close / reopen developer.

Check-out solution again and this time contents from both solutions were visible.

This is a very convoluted route to getting solution / data accross from one PC to another - it’s not very intuitive either. Have I missed a point or is there some sequence of steps I need to take to make this process easier and less error prone?

BTW we tried this on a Win XP PC and a Mac. Same result.

This is really a job for team provider … I think using Servoy Team Provider is better solution( even if you are not in the same network you can use a repository for merged version, then just replace current repository with merge repository for team operations and send the repository through email, for example). Or, if you have access to a computer with IP visible on internet set up an svn server there ( there are free SVN servers). Just a few ideas …

lvostinar:
This is really a job for team provider … I think using Servoy Team Provider is better solution( even if you are not in the same network you can use a repository for merged version, then just replace current repository with merge repository for team operations and send the repository through email, for example). Or, if you have access to a computer with IP visible on internet set up an svn server there ( there are free SVN servers). Just a few ideas …

Laurian - I’ve had another thought regarding making it easy to use the same solution accross multiple machines for a single developer (oh no, :shock: ).

I have a synchronisation directory running accross all my developemnt PC’s (its DropBox actually) for my other development tools.

My understanding is that as a stand alone developer, all my solution definitions are held in the servoy_workspace until I move them to the repository overtly - is that correct?

If so, and if I can use my servoy_workspace from any location on my PC, then I could have that workspace synched on all my development PC’s (assuming I’ll only use 1 at a time of course)?

Would this work, and what other files might need to be synched too?

Appreciate your feedback Laurian.

My understanding is that as a stand alone developer, all my solution definitions are held in the servoy_workspace until I move them to the repository overtly - is that correct?

yes

If so, and if I can use my servoy_workspace from any location on my PC, then I could have that workspace synched on all my development PC’s (assuming I’ll only use 1 at a time of course)?

Yes, this DropBox seems to actually be an SVN client which connects to an SVN server (or anyway something similar). You need to synchronize the folder of each solution (or module) and the resources project folder (each solution has a resources project also, may be the same for multiple solutions). Then you just have to worrie about your database data (if you use separate servers).

lvostinar:
Yes, this DropBox seems to actually be an SVN client which connects to an SVN server (or anyway something similar). You need to synchronize the folder of each solution (or module) and the resources project folder (each solution has a resources project also, may be the same for multiple solutions). Then you just have to worrie about your database data (if you use separate servers).

Excellent :D - I’ll give that try tomorrow

Cheers Laurian.