Servoy and Git

Questions and answers regarding the use of eclipse environment as seen in Servoy Developer

Servoy and Git

Postby swingman » Thu Jan 31, 2013 2:43 pm

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
Christian Batchelor
Certified Servoy Developer
Batchelor Associates Ltd, London, UK
http://www.batchelorassociates.co.uk

http://www.postgresql.org - The world's most advanced open source database.
User avatar
swingman
 
Posts: 1472
Joined: Wed Oct 01, 2003 10:20 am
Location: London

Re: Servoy and Git

Postby ngervasi » Fri Feb 01, 2013 4:06 pm

Stick to SVN, life is complicated enough... ;)
Nicola Gervasi
sintpro.com
SAN Partner
ngervasi
 
Posts: 1485
Joined: Tue Dec 21, 2004 12:47 pm
Location: Arezzo, Italy

Re: Servoy and Git

Postby Harjo » Fri Feb 01, 2013 4:54 pm

Why? svn not complicated when it comes to merges? :lol:

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/
Harjo Kompagnie
ServoyCamp
Servoy Certified Developer
Servoy Valued Professional
SAN Developer
Harjo
 
Posts: 4321
Joined: Fri Apr 25, 2003 11:42 pm
Location: DEN HAM OV, The Netherlands

Re: Servoy and Git

Postby swingman » Tue Feb 05, 2013 2:58 am

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.
Christian Batchelor
Certified Servoy Developer
Batchelor Associates Ltd, London, UK
http://www.batchelorassociates.co.uk

http://www.postgresql.org - The world's most advanced open source database.
User avatar
swingman
 
Posts: 1472
Joined: Wed Oct 01, 2003 10:20 am
Location: London

Re: Servoy and Git

Postby ROCLASI » Tue Feb 05, 2013 10:30 am

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.
Robert Ivens
SAN Developer / Servoy Valued Professional / Servoy Certified Developer

ROCLASI Software Solutions / JBS Group, Partner
Mastodon: @roclasi
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5438
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium

Re: Servoy and Git

Postby ROCLASI » Tue Feb 05, 2013 10:57 am

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

EGit_JGit_2.2_features.png
EGit_JGit_2.2_features.png (247.07 KiB) Viewed 7605 times


Hope this helps.
Robert Ivens
SAN Developer / Servoy Valued Professional / Servoy Certified Developer

ROCLASI Software Solutions / JBS Group, Partner
Mastodon: @roclasi
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5438
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium

Re: Servoy and Git

Postby IT2Be » Tue Feb 05, 2013 10:58 am

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 :)
Marcel J.G. Trapman (IT2BE)
SAN partner - Freelance Java and Servoy
Servoy Components - IT2BE Plug-ins and Beans for Servoy
ServoyForge - Open Source Components for Servoy
User avatar
IT2Be
Servoy Expert
 
Posts: 4766
Joined: Tue Oct 14, 2003 7:09 pm
Location: Germany

Re: Servoy and Git

Postby jcompagner » Thu Feb 07, 2013 5:51 pm

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!
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 8829
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: Servoy and Git

Postby jcompagner » Thu Feb 07, 2013 5:58 pm

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
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 8829
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: Servoy and Git

Postby ryanparrish » Mon Feb 11, 2013 5:29 pm

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
 
Posts: 162
Joined: Thu May 17, 2007 7:49 pm
Location: Miami, FL

Re: Servoy and Git

Postby jcompagner » Mon Feb 11, 2013 6:19 pm

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?
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 8829
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: Servoy and Git

Postby ROCLASI » Thu Feb 28, 2013 2:35 pm

Atlassian has put a nice tutorial up about how to use Git and the different workflows.
Check it out.
Robert Ivens
SAN Developer / Servoy Valued Professional / Servoy Certified Developer

ROCLASI Software Solutions / JBS Group, Partner
Mastodon: @roclasi
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5438
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium


Return to Eclipse Environment

Who is online

Users browsing this forum: No registered users and 8 guests