commit / update / merge

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

commit / update / merge

Postby Thunder » Thu Oct 01, 2009 2:52 pm

Hi all

If I delete a method from my local workspace, how do I commit that change to the repository server? There seems no manual way to edit the remote files, and deleting, committing, and updating simply pulls the deleted method back to my workspace.

Thanks

Bevil
Thunder
 
Posts: 431
Joined: Thu Apr 24, 2003 10:33 am
Location: London

Re: commit / update / merge

Postby mboegem » Thu Oct 01, 2009 3:31 pm

Hi Bevil,

Thunder wrote:There seems no manual way to edit the remote files

No there isn't, in basic it is like this:
start a team synchronization which brings you in sync-perspective, then handle the changes step by step.
commit: write local changes to the remote files
update: update the remote files to your local files

when having conflict:
a) look at the changes local AND remote
b) copy each remote change manually to the local files
c) proceed 'mark as merge' on the local file
d) commit, which does the regular commit action again.

I think this thread with the explaination of Paul Bakker should help you:
http://forum.servoy.com/viewtopic.php?f=38&t=11054

also this will help:
http://www.servoy.com/docs/servoy_4/servoy_4_teamSupport.pdf

Good luck!
Marc Boegem
Solutiative / JBS Group, Partner
• Servoy Certified Developer
• Servoy Valued Professional
• Freelance Developer

Image

Partner of Tower - The most powerful Git client for Mac and Windows
User avatar
mboegem
 
Posts: 1743
Joined: Sun Oct 14, 2007 1:34 pm
Location: Amsterdam

Re: commit / update / merge

Postby Thunder » Thu Oct 01, 2009 4:06 pm

Hi Marc.

Thanks for the reply, but it is contradictory....

When I ask for a way to edit remote files, you say:
No there isn't, in basic it is like this:


and then you say:
commit: write local changes to the remote files

does it only ADD to the repository?? Or does it - as you say - change the remote files?? In which case does it not do deletions??

Best

Bevil
Thunder
 
Posts: 431
Joined: Thu Apr 24, 2003 10:33 am
Location: London

Re: commit / update / merge

Postby mboegem » Thu Oct 01, 2009 5:13 pm

Thunder wrote:Thanks for the reply, but it is contradictory....

If you do ask for 'edit' I assume a direct edit possibility, ie. direct typing/deleting in the file. This is impossible.

What is possible is do a commit, which does write your local changes to the remote file. In the end you are of course 'editing' your remote file, but not literally.

So, when you deleted code in your local files, you should see the comparison editor in the sync perspective which has an 'insert line' at the left hand side of the editor which points to a whole 'bordered' block of code at the right hand side of your editor.
Marc Boegem
Solutiative / JBS Group, Partner
• Servoy Certified Developer
• Servoy Valued Professional
• Freelance Developer

Image

Partner of Tower - The most powerful Git client for Mac and Windows
User avatar
mboegem
 
Posts: 1743
Joined: Sun Oct 14, 2007 1:34 pm
Location: Amsterdam

Re: commit / update / merge

Postby Thunder » Thu Oct 01, 2009 6:36 pm

Aha, I see what you mean, sorry, I misunderstood.

However, the problem I'm having is that it doesn't allow commit because "Could not put all changes due to conflicts, resolve conflicts first", but this is not allowed. As you say, you cannot directly edit the remote file. So it won't commit, and you can't edit it. Therefore I remain stumped...

I cannot see "insert line" on the left side of the editor. See attached screenshot of what I see in the compare editor in the synchronisation perspective...

Thanks Marc for your help..
Attachments
Screen shot 2009-10-01 at 17.35.20.png
Screen shot 2009-10-01 at 17.35.20.png (398.18 KiB) Viewed 4314 times
Thunder
 
Posts: 431
Joined: Thu Apr 24, 2003 10:33 am
Location: London

Re: commit / update / merge

Postby mboegem » Thu Oct 01, 2009 8:49 pm

Ok, so I tried to explain it in the edited screenshot below.

First of all: in the compare editor I've drawn circles around the 'insert' line and the 'bordered' block where I was referring to earlier.
Those are connected by a line. Left is local, right is remote, so in this case you've deleted something locally or someone else has committed something earlier to the remote file.

The other circles:
A: with these buttons you can copy changes from remote file to the local file.
B: with these buttons you can step through the changes.
C/D: the red filled rectangular indicates there's a conflict in this file, the other rectangulars in the margin indicate where about the differences between the files are.
E: with these buttons you switch between: conflict mode, outgoing mode, incoming mode.

First of all you should switch to conflict mode (buttons E) and solve the conflicts:
a) open a conflict in the compare editor
b) manually step through all changes with buttons B
c) you have to investigated for every change, which file is the truth: local or remote. Local? just leave it and step on to the next, Remote? copy the change to your local file with buttons A and move on to the next change.
d) if you stepped through all the changes: rightclick in the local area of the editor and press: 'mark as merged'. This is a flag which is an indicator for eclipse that your local file has all the code you want to keep.
Now this change will move to outgoing mode.
Repeat these steps for all conflicts.

Second: move to outgoing mode with buttons E:
a) just commit all the changes that are shown in the left navigation panel (below buttons E)

Third: move to incoming mode with buttons E:
a) just update all the changes that are shown in the left navigation panel (below buttons E)

Hope this will help you move on...

Screen shot 2009-10-01 at 17.35.20.JPG
Screen shot 2009-10-01 at 17.35.20.JPG (347.52 KiB) Viewed 4298 times
Marc Boegem
Solutiative / JBS Group, Partner
• Servoy Certified Developer
• Servoy Valued Professional
• Freelance Developer

Image

Partner of Tower - The most powerful Git client for Mac and Windows
User avatar
mboegem
 
Posts: 1743
Joined: Sun Oct 14, 2007 1:34 pm
Location: Amsterdam

Re: commit / update / merge

Postby Thunder » Fri Oct 02, 2009 12:47 am

Hi Marc

Thank you so much. You have helped me nail it... The key was 'mark as merged' I didn't understand that you need to mark as merged and then commit in order for the local side to be forced onto the remote side. That has solved it...

Thank you.

Bevil
Thunder
 
Posts: 431
Joined: Thu Apr 24, 2003 10:33 am
Location: London


Return to Eclipse Environment

Who is online

Users browsing this forum: No registered users and 3 guests

cron