Git problems using amend commit / branches / merging

Discuss all problems you have with Servoy here. It might help to mention the Servoy version and Operating System version you are using

Re: Git problems using amend commit / branches / merging

Postby ROCLASI » Mon Aug 11, 2014 4:28 pm

Hi Sebastian,

I played with it but don't use it with any projects yet.
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: Git problems using amend commit / branches / merging

Postby david » Mon Aug 11, 2014 4:45 pm

deezzub wrote:David, Robert, do you use Servoy with Git and branches?


We don't. Since we use Git for all types of development and Git being the beast that it is, it's easier/simpler for us to use a stand alone tool. Only one interface to learn.
David Workman, Kabootit

Image
Everything you need to build great apps with Servoy
User avatar
david
 
Posts: 1727
Joined: Thu Apr 24, 2003 4:18 pm
Location: Washington, D.C.

Re: Git problems using amend commit / branches / merging

Postby david » Mon Aug 11, 2014 4:49 pm

ROCLASI wrote:I guess it's time to dust off your Mac then ;)


I heard all of these companies bought macs just to use Tower 2 :D

Screen Shot 2014-08-11 at 10.46.46 AM.png
Screen Shot 2014-08-11 at 10.46.46 AM.png (225.12 KiB) Viewed 8998 times
David Workman, Kabootit

Image
Everything you need to build great apps with Servoy
User avatar
david
 
Posts: 1727
Joined: Thu Apr 24, 2003 4:18 pm
Location: Washington, D.C.

Re: Git problems using amend commit / branches / merging

Postby ROCLASI » Mon Aug 11, 2014 4:50 pm

Hi David,

david wrote:We don't. Since we use Git for all types of development and Git being the beast that it is, it's easier/simpler for us to use a stand alone tool. Only one interface to learn.


So you do use it with Servoy, you just don't use EGit. I believe that was Sebastians question.
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: Git problems using amend commit / branches / merging

Postby deezzub » Mon Aug 11, 2014 4:54 pm

ROCLASI wrote:Hi David,

david wrote:We don't. Since we use Git for all types of development and Git being the beast that it is, it's easier/simpler for us to use a stand alone tool. Only one interface to learn.


So you do use it with Servoy, you just don't use EGit. I believe that was Sebastians question.

Thanks Robert, that is what I want to know. :)
deezzub
 
Posts: 328
Joined: Tue May 28, 2013 3:02 pm
Location: Oldenburg, Germany

Re: Git problems using amend commit / branches / merging

Postby IT2Be » Mon Aug 11, 2014 5:29 pm

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.
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: Git problems using amend commit / branches / merging

Postby deezzub » Mon Aug 11, 2014 6:46 pm

IT2Be wrote: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?
deezzub
 
Posts: 328
Joined: Tue May 28, 2013 3:02 pm
Location: Oldenburg, Germany

Re: Git problems using amend commit / branches / merging

Postby deezzub » Tue Sep 16, 2014 10:44 am

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.
deezzub
 
Posts: 328
Joined: Tue May 28, 2013 3:02 pm
Location: Oldenburg, Germany

Re: Git problems using amend commit / branches / merging

Postby jcompagner » Tue Sep 16, 2014 12:43 pm

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

Re: Git problems using amend commit / branches / merging

Postby deezzub » Wed Sep 24, 2014 9:30 am

I tried the latest EGit stable nightly updates as suggested and the problem is still there.
deezzub
 
Posts: 328
Joined: Tue May 28, 2013 3:02 pm
Location: Oldenburg, Germany

Re: Git problems using amend commit / branches / merging

Postby deezzub » Mon Sep 29, 2014 3:49 pm

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.
deezzub
 
Posts: 328
Joined: Tue May 28, 2013 3:02 pm
Location: Oldenburg, Germany

Re: Git problems using amend commit / branches / merging

Postby david » Mon Sep 29, 2014 6:37 pm

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.
David Workman, Kabootit

Image
Everything you need to build great apps with Servoy
User avatar
david
 
Posts: 1727
Joined: Thu Apr 24, 2003 4:18 pm
Location: Washington, D.C.

Re: Git problems using amend commit / branches / merging

Postby deezzub » Tue Oct 07, 2014 12:43 pm

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.
deezzub
 
Posts: 328
Joined: Tue May 28, 2013 3:02 pm
Location: Oldenburg, Germany

Re: Git problems using amend commit / branches / merging

Postby Mccourt.cordingley1372837951 » Wed Oct 08, 2014 9:45 am

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.

[url]
https://www.google.co.uk/url?sa=t&rct=j ... 3099,d.ZGU
[/url]

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.
User avatar
Mccourt.cordingley1372837951
 
Posts: 28
Joined: Wed Jul 03, 2013 9:52 am

Re: Git problems using amend commit / branches / merging

Postby deezzub » Wed Oct 08, 2014 12:54 pm

Mccourt.cordingley1372837951 wrote: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.

[url]
https://www.google.co.uk/url?sa=t&rct=j ... 3099,d.ZGU
[/url]

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.
deezzub
 
Posts: 328
Joined: Tue May 28, 2013 3:02 pm
Location: Oldenburg, Germany

PreviousNext

Return to Discuss possible Issues and Bugs

Who is online

Users browsing this forum: No registered users and 6 guests

cron