I've been trying to sync up with my local copy from SGV which is proving a little tricky, mainly due to the modifications we have made to our version. When I merge in the diffs things start to go awry - especially as the proj file is of course different for our build. Bringing new files in seems to be a case of cutting and pasting from the working local folder into VS...
Is there a better way? Especially during this Beta phase where files are being modified quite frequently
We have done a couple of these migrations and our preferred method is to start with a clean install of the latest build of SplendidCRM in a separate folder, then add the custom files that you have created. We then use the SourceGear DiffMerge utility to compare old to new.
Hopefully, you have tried hard not to make changes everywhere, but instead have tried to just add files. If that is the case, then it is relatively easy to upgrade. If you have manually edited lots of our files, then you have more work ahead. Sorry about that, but one of our customers (might be you) requested that we reduce the amount of code that was copyright by SugarCRM. This request made great sense, but it required lots of file changes.
If you need help with the migration, just contact our support staff and they can walk you through.
I did it the other way round by using DiffMerge to bring the changes into my version which seems to work pretty good. Of course that doesn't capture any of the database changes - I'm guessing SplendidConfigure.exe does this.
The other observation I would make is that the SGV contains the very latest code ( rather than the stable code in the installers ) this means that it may not always compile while people are working on bits and pieces. Maybe it would be better to have a stable branch and a dev branch - actually you probably do that already is the code in the vault the dev version?
We thought about that, but it is just too much effort to maintain multiple code streams. Besides, there is a certain about of transparency that you get by being able to access the main development code stream. As a user of the SplendidCRM platform, you just have to be smart about how you leverage the resource. Otherwise, you can just wait until the next published release.
