I use GIT for my all my projects too but, like David said, I don’t use it from within Eclipse and/or Servoy.
I use Tower from day one and it even got better (mostly easier to use) with v2.
IT2Be:
I use GIT for my all my projects too but, like David said, I don’t use it from within Eclipse and/or Servoy.I use Tower from day one and it even got better (mostly easier to use) with v2.
Do you use / switch branches during an open Servoy? Do you have EGit in Servoy installed, but you don’t use it?
Could it be the case, that Servoy holds internal a state of forms, js-files etc.? I had a case, where the form editor is not correct updated, after using EGit “Stash Changes” function.
yes servoy hold internal state, which is refreshed when resources are changed and the eclipse framework gives use resource changed events (what should happen with stashing)
I tried the latest EGit stable nightly updates as suggested and the problem is still there.
Now, I had a case where I stashed all changes and after that, I have still 1 changed JS-file in the EGit (v.3.5.1.201409262329) “Unstaged Changes” area. Exactly the changes, which should also be stashed.
Our use of branches is limited to archiving, versioning and experimental work. Our main workflow uses the main branch for all development and then we resolve multiple developer conflicts as they come up.
As Andrei Costescu me suggested at the Servoy World, I use now Servoy without EGit. I installed a fresh version of Servoy 7.4.1 for use without EGit, only for use with Git terminal. I switched a branch in Git terminal, but Servoy does not seem to realize that. I opened a JS file and it was out of sync, so I pressed F5. How can I refresh the FRM file, because Servoy showed the wrong FRM file version. I started the Smart Client and it was the wrong version, not the branch version. I closed the Smart Client and go again to the same JS file as before and it was again out of sync, so I pressed F5 again after that also the correct FRM file was there. This would be explain, why EGit has wrong content in the staging area, so maybe it is not an EGit bug.
I had also case, where a clean does not fix wrong content in the editors. I had to close Servoy and open it again, then Serrvoy showed the correct content.
HI
IMHO Sourcetree with Servoy is a real no hassle setup, and with the built git flow for branching and merging its very easy use.
Dotzlaw has a great tutorial on it.
https://www.google.co.uk/url?sa=t&rct=j … 3099,d.ZGU
Since migrating from SVN to Git and Sourcetree. Our lives have certainly been more productive due to the speed and ease of use.
I personally found EGit to be very non intuitive and cumbersome.
Mccourt.cordingley1372837951:
HIIMHO Sourcetree with Servoy is a real no hassle setup, and with the built git flow for branching and merging its very easy use.
Dotzlaw has a great tutorial on it.
https://www.google.co.uk/url?sa=t&rct=j … 3099,d.ZGU
Since migrating from SVN to Git and Sourcetree. Our lives have certainly been more productive due to the speed and ease of use.
I personally found EGit to be very non intuitive and cumbersome.
If Servoy does not work with original Git, then your tip will also not work without problems.
if you change the file system underneath eclipse (like you do with command line git)
You have to make sure that eclipse sees all those changes (so do a full refresh after every git command!)
Also you can have a look at the preferences of eclipse/developer → General → Workspace there you have options like “refresh using native hooks or polling” or “refresh on access”
jcompagner:
You have to make sure that eclipse sees all those changes (so do a full refresh after every git command!)
How can I do a full refresh? As far as I can see, if I in a form editor, I have no refresh available in the menu.
jcompagner:
Also you can have a look at the preferences of eclipse/developer → General → Workspace there you have options like “refresh using native hooks or polling” or “refresh on access”
I have now activated both. I have done a git stash in terminal and if I do a git status I see a tracked file which should be stashed, so it should not be visible after stashing.
I use SourceTree almost exclusively but keep EGit installed in Servoy, and do not seem to have quite as many issues with refreshing as what is described here.
My fail-safe way for refreshing is to switch to the Resources perspective, select all folders and refresh that. This refreshes all source files, forms, valuelists, etc
jgarfield:
I use SourceTree almost exclusively but keep EGit installed in Servoy, and do not seem to have quite as many issues with refreshing as what is described here.
Do you use branches?
jgarfield:
My fail-safe way for refreshing is to switch to the Resources perspective, select all folders and refresh that. This refreshes all source files, forms, valuelists, etc
I try it, but I think that should not be needed. If you use EGit in Servoy / Eclipse, EGit should notify Servoy / Eclipse that there are changes.
deezzub:
I try it, but I think that should not be needed. If you use EGit in Servoy / Eclipse, EGit should notify Servoy / Eclipse that there are changes.
yes IF you use EGit then it is not needed
but if you use any 3th party tool underneath eclipse (servoy has nothing to do with this) then you need to make sure a refresh happens
i think in the solex tree we also have a refresh item in the toolbar of the solex.
Else you have to use Navigator and select the project and call refresh on that from the popup menu.
Eclipse has all kind of internal caches and states, so you need to say to eclipse that something is changed if you change it from the outside world
This doesnt matter if it is git or if you use a editor outside of eclipse and change a file. (just try this, open a frm file and change the text of a label)
that you only should see after a refresh in eclipse,