TIP: Choosing an SVN Client for Eclipse

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

Re: TIP: Choosing an SVN Client for Eclipse

Postby ROCLASI » Thu Jan 21, 2010 11:37 am

Seems the consensus is now that Subclipse is the better tool for the job than Subversive. Perhaps time to update this tip ?
Robert Ivens
ROCLASI Software Solutions / JBS Group, Partner
SAN Developer / Servoy Valued Professional / Servoy Certified Developer
Twitter: @roclasi / @servoyforge
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5189
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium

Re: TIP: Choosing an SVN Client for Eclipse

Postby ROCLASI » Thu Jan 21, 2010 5:58 pm

I've created a screencast that explains how to migrate from Subversive to Subclipse in Servoy 5.

http://guides.roclasi.com/subversive2subclipse/

Hope this helps.


Edit:
Oops! I see I forgot one thing in the video.
IMPORTANT: also disconnect/unshare your resources!
I uploaded a new version of the video where it mentions this.
Last edited by ROCLASI on Thu Jan 21, 2010 7:01 pm, edited 1 time in total.
Robert Ivens
ROCLASI Software Solutions / JBS Group, Partner
SAN Developer / Servoy Valued Professional / Servoy Certified Developer
Twitter: @roclasi / @servoyforge
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5189
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium

Re: TIP: Choosing an SVN Client for Eclipse

Postby Hans Nieuwenhuis » Thu Jan 21, 2010 6:28 pm

Thanks Robert !!

Good Job ( as usual ;-) )

Regards,
Hans Nieuwenhuis
Betagraphics
http://www.deltics.nl
http://www.betagraphics.nl

Servoy Version 7.3.1
Java version 1.7.0.x
Database Oracle 11g
User avatar
Hans Nieuwenhuis
 
Posts: 1026
Joined: Thu Apr 12, 2007 12:36 pm
Location: Hengelo, The Netherlands

Re: TIP: Choosing an SVN Client for Eclipse

Postby GevatterTod » Mon Jan 25, 2010 11:29 am

Here is another thing, which made me going mad the whole weekend.
I think most of u guys will allready know, but maybe some will not.

I wanted to checkout a solution at home, on which i am working right now.

I right-clicked in the "all Solutions" node, and then checkout.

!THIS IS NOT THE WAY IT WILL WORK! gnarf.
I tried ALL imaginable path to get my solution checked out. But all i got were lousy errors.

Here is the way to go:

Chos´e from the menu:
File -> Import -> SVN -> Checkout Projects from SVN

Add Your Repository URL if its not allready there.

Checkout.
Start to work.

Took me 2 FU**ING days to figure it out.

So, to avoid more collateral damage (right now: 1 Keyboard, traces of my teeth on my desk, and my girlfriend not talking to me for an hour or so, because i was rude to her)
I figured to mention this for others, who face the problem than i did ;)

So long

Jan
This is a signature!
User avatar
GevatterTod
 
Posts: 53
Joined: Thu Sep 24, 2009 4:57 pm
Location: Frankfurt/Main, Germany

Re: TIP: Choosing an SVN Client for Eclipse

Postby ROCLASI » Mon Jan 25, 2010 1:32 pm

Yeah, perhaps Servoy should rename that option to Servoy Team Server-ONLY checkout or something..

Just a thought.


Anyway, another way to check your sources out from SVN is to go into the SVN Repositories perspective and expand the connection in the SVN repositories view (on the left). Expand the trunk node (if you use this repository format) and then right-click on the projects you want to check out.
Robert Ivens
ROCLASI Software Solutions / JBS Group, Partner
SAN Developer / Servoy Valued Professional / Servoy Certified Developer
Twitter: @roclasi / @servoyforge
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5189
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium

Re: TIP: Choosing an SVN Client for Eclipse

Postby Kahuna » Mon Feb 08, 2010 11:34 am

We've converted to Subclipse now and it seems a little more speedy than Subversion, however the concept of fixing conflicts is not really very straight forward in this software.

In Subverssion, where there was a conflict, we could use the 'Override and Commit' to move local changes to the SVN, that option is not in Subclipse?

'Mark as Merged' seems like the only way to resolve conflicts without overwriting local resources - and (to my mind anyway) that suggests that the conflict is simply discounted and the differences are not actually resolved? Is that how it works?

What's the best way to resolve conflicts if you want to apply the local changes to the SVN in Subclipse?
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain

Re: TIP: Choosing an SVN Client for Eclipse

Postby jcompagner » Mon Feb 08, 2010 12:06 pm

Kahuna wrote:We've converted to Subclipse now and it seems a little more speedy than Subversion, however the concept of fixing conflicts is not really very straight forward in this software.

In Subverssion, where there was a conflict, we could use the 'Override and Commit' to move local changes to the SVN, that option is not in Subclipse?

'Mark as Merged' seems like the only way to resolve conflicts without overwriting local resources - and (to my mind anyway) that suggests that the conflict is simply discounted and the differences are not actually resolved? Is that how it works?

What's the best way to resolve conflicts if you want to apply the local changes to the SVN in Subclipse?



with mark as merged yes, and then say use my version of the file (instead of use the incoming version of the file)

I find the Override and commit quite a dangerous option, then i think i even never would have used,
just as i almost never use mark as merged-> use my version, i almost always try to merge them in the compare window by copying the changes over. Or say that i want the incoming version.
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 7929
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: TIP: Choosing an SVN Client for Eclipse

Postby Kahuna » Mon Feb 08, 2010 12:12 pm

jcompagner wrote:
just as i almost never use mark as merged-> use my version, i almost always try to merge them in the compare window by copying the changes over. Or say that i want the incoming version.


Where is the 'mark as merged-> use my version' in the menu Johan? And I don't seem to be able to edit the remote file in compare editor either. I've obviously not got it!
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain

Re: TIP: Choosing an SVN Client for Eclipse

Postby jcompagner » Mon Feb 08, 2010 2:54 pm

Sorry was not completely clear:
First does do an update
Then you have a conflict file
there you can say on Mark Resolved... that will bring up an dialog with options what you exactly want to do.
Before that you can first say-> Edit Conflicts that will bring up the compare window with the conflict pointed out to you.
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 7929
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: TIP: Choosing an SVN Client for Eclipse

Postby Kahuna » Mon Feb 08, 2010 3:14 pm

jcompagner wrote:Sorry was not completely clear:
First does do an update
Then you have a conflict file
there you can say on Mark Resolved... that will bring up an dialog with options what you exactly want to do.
Before that you can first say-> Edit Conflicts that will bring up the compare window with the conflict pointed out to you.


Sorry Johan - I'm being totally dumb here - but I don't understand your method. Here's what I have:

I get a conflict and I view it in the conflict editor. On the right I have a different tooltip to my local version (not a big deal but I want to use it as an example).

I cant edit the right side pane, and the right-click menu on the element in the sync pane only allows me to Mark As Merged or Update?

If I mark as Merged then my local version seems to be updated???

How do I get the remote version to match the local version in this instance? My local version is the Master.
(Servoy Version: 6.0.7 Win XP / 7 - SQL Server 2008 R2)
Ian Cordingley (Kahuna)
Kahuna
 
Posts: 1235
Joined: Thu Oct 26, 2006 1:39 am
Location: 1/2 NE UK 1/2 Olvera Spain

Re: TIP: Choosing an SVN Client for Eclipse

Postby jcompagner » Mon Feb 08, 2010 3:20 pm

you can edit the right value, thats logical because thats the server value.
You can only edit your working copy and thats the left.

I was talking about files that are really in conflict. So you changed the exact same line in your working copy as the server did
Then when you update it you get a file that has the status Conflict

On those files Team->Edit Conflicts.... or Team-> Mark as Resolved.... are enabled.

I dont know exactly in what state you are with your files. Did you already really do an update?
Or are you purely in the synchronize view before an update. And then you are viewing it.
I dont know what then Mark as Merged should really do. I guess you should ask a svn guy that.


EDIT: i just did it, so in a synchronize view i had a conflict, i changed the same line. Then i say mark as merged, and i just kept my change.
After that i could commit the change that i made in to svn.
Johan Compagner
Servoy
User avatar
jcompagner
 
Posts: 7929
Joined: Tue May 27, 2003 7:26 pm
Location: The Internet

Re: TIP: Choosing an SVN Client for Eclipse

Postby tgs » Tue Nov 23, 2010 2:10 pm

I have two svn repositories on two different server (one only for internal use and the other for external connections).
When I disconnect a solution from one svn repository and would like share it with the other svn repository server, it does not work! I don't have deleted the SVN meta information while disconnecting. In the Share Project dialog I get only the Host address from my previous svn repository server.
Is there a save way to change to an other svn repository server and/or do have both?

Thomas
Thomas Schnaus
SAN Developer
yomotec GmbH
User avatar
tgs
 
Posts: 833
Joined: Wed Oct 04, 2006 12:05 pm
Location: Germany

Re: TIP: Choosing an SVN Client for Eclipse

Postby ROCLASI » Tue Nov 23, 2010 2:26 pm

Hi Thomas,

What are you trying to do exactly. You want to share/commit it to the external SVN and then connect it back again to the internal SVN ?
Robert Ivens
ROCLASI Software Solutions / JBS Group, Partner
SAN Developer / Servoy Valued Professional / Servoy Certified Developer
Twitter: @roclasi / @servoyforge
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5189
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium

Re: TIP: Choosing an SVN Client for Eclipse

Postby tgs » Tue Nov 23, 2010 2:55 pm

ROCLASI wrote:What are you trying to do exactly. You want to share/commit it to the external SVN and then connect it back again to the internal SVN ?

Normally not! But sometimes I would like to commit an "internal" project to the external svn repo server and/or I have different projects for internal and external. If I have shared a project to the internal server I also would like the share/commit it to the external.... if possible.
Thomas Schnaus
SAN Developer
yomotec GmbH
User avatar
tgs
 
Posts: 833
Joined: Wed Oct 04, 2006 12:05 pm
Location: Germany

Re: TIP: Choosing an SVN Client for Eclipse

Postby ROCLASI » Tue Nov 23, 2010 3:00 pm

Hi Thomas,

You can't share a project to 2 SVN repositories at the same time and switching back and forth between then is also not recommended.
If the only thing you want to do is to put it on the external SVN for others to checkout then you could setup a new workspace. Export your solution from your original workspace, import it into the new workspace and share it with the external SVN server. This way you have one workspace that is for internal use and one for the external SVN.

Hope this helps.
Robert Ivens
ROCLASI Software Solutions / JBS Group, Partner
SAN Developer / Servoy Valued Professional / Servoy Certified Developer
Twitter: @roclasi / @servoyforge
--
ServoyForge - Building Open Source Software.
PostgreSQL - The world's most advanced open source database.
User avatar
ROCLASI
Servoy Expert
 
Posts: 5189
Joined: Thu Oct 02, 2003 9:49 am
Location: Netherlands/Belgium

PreviousNext

Return to Eclipse Environment

Who is online

Users browsing this forum: No registered users and 1 guest