Servoy Forum

Hi all,

I have been using Git for version control with Servoy for a while. But I may be doing it in a un-Servoy way:

- Each of my workspaces are set up as a git repository.
- Every now and then I do a 'git status' of the workspace folder from the terminal and I 'git add' any new files and do a 'git commit' followed by 'git push origin master' to push the changes up to my github account.

This works well for me working on my own. I'm about to start collaborating with someone else. So I was thinking he can work on his own branch and then we merge now and then.
Anything we should watch out for, or better ways of using git with Servoy?

Thanks,

Christian

Stick to SVN, life is complicated enough...

Why? svn not complicated when it comes to merges?

we are exploring now Kiln with Servoy (which is based on Mercurial, also a dvcs)

look at this video, it gives a quick overview & differences with SVN: http://www.fogcreek.com/kiln/

Mercurial is very similar to git in concept. There is eGit for Eclipse, but it looks to me that the Eclipse version used by Servoy is too old.
I have decided to use git via the command line with Servoy. It works fine, the commands are easy to remember.

Hi Christian,

EGit and it's all-java Git implementation JGit are at version 2.2 (released last december) are now pretty up to date with Git.
This version is for Eclipse 3.7+ (Indigo and up) which means you can use it in Servoy 6.1 and up.
The next release (2.3) of EGit is also around the corner (feb 22, 2013)

As for the original question about workflows I am also looking at that. Still researching though.

Here is a slide of the 2.2. release review that shows what Git commands are supported.



Hope this helps.

I like the concept of Git more than that of SVN so I do not use SVN anymore (the only exception is ServoyForge).

To work with (my) Git repositories I use Tower on my Mac.

It is easy to use, you can document your updates very easy, tagging is done in a split second.

Push/pull with a remote repository is easy as well.

You can even clone a svn repository from within the app

ROCLASI wrote:The next release (2.3) of EGit is also around the corner (feb 22, 2013)

phh, why wait for that...

i just have this update site:

http://download.eclipse.org/egit/updates-nightly

every day a nice new egit/jgit!

ROCLASI wrote:Here is a slide of the 2.2. release review that shows what Git commands are supported.

EGit_JGit_2.2_features.png

Hope this helps.

that doesn't display it all, especially for me 1 big other thing:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=315264

jcompagner wrote:

ROCLASI wrote:Here is a slide of the 2.2. release review that shows what Git commands are supported.

EGit_JGit_2.2_features.png

Hope this helps.

that doesn't display it all, especially for me 1 big other thing:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=315264

Check out http://subgit.com, you don't even have to bother with git-svn and the various caveats involved, just pure git on the "client" side.

ryanparrish wrote:

Check out http://subgit.com, you don't even have to bother with git-svn and the various caveats involved, just pure git on the "client" side.

interesting how they do that
Because they tell us that there still can be svn and git users working on the svn repository..
And that commits/push stuff of git are commits to svn even async, how is that possible...
Because what happens if a svn users just did a commit on the same file and line?

Atlassian has put a nice tutorial up about how to use Git and the different workflows.
Check it out.