Eclipse Community Forums: EGit / JGit » Setting up Synchronisation with Remote Repository

Home » Eclipse Projects » EGit / JGit » Setting up Synchronisation with Remote Repository(Newbie setting up Egit: Team Window "Synchronize Git")

Show: Today's Messages :: Show Polls :: Message Navigator

Setting up Synchronisation with Remote Repository [message #690229]

Wed, 29 June 2011 08:18

michelle

Messages: 87
Registered: April 2010
Location: South Africa

Member

I have a repository setup remotely on a computer called SDSERVER. I have an eclipse project called GearCalc checked in to the master branch of this repository. I have imported a "Git Project" and am now synchronising for the first time.

I get asked to select a 'Desitination' as shown in the screenshot. Is my understanding which I have described in the attached screenshot correct? In other words, am I choosing the correct destination with the right thoughts in mind?

Thank-you in advance, Michelle

index.php/fa/3172/0/

Attachment: Synchronise_eGIT_Repository_settings.png
(Size: 33.35KB, Downloaded 4764 times)

[Updated on: Wed, 29 June 2011 08:20]

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690252 is a reply to message #690229]

Wed, 29 June 2011 09:26

Manuel Doninger

Messages: 119
Registered: October 2010

Senior Member

No. You are synchronizing with the remote tracking branch origin/master. This branch represents the contents of the branch master in the remote repository, but is also locally in your repository. You can update your remote tracking branch with the Fetch command. If you did that, then you synchronize against the contents of the remote repository (but still as a local operation).

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690254 is a reply to message #690229]

Wed, 29 June 2011 09:28

Dariusz Luksza

Messages: 40
Registered: July 2010

Member

Yes yours understanding is correct.

You also need to remember that all changes that are in destination (in this case origin/master) will be marked as incoming and all changes that are in local master will be marked as outgoing.

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690267 is a reply to message #690254]

Wed, 29 June 2011 09:47

Manuel Doninger

Messages: 119
Registered: October 2010

Senior Member

Ok, then my understanding is wrong (since Dariusz wrote the whole Synchronizing thing, he is an expert in that, i don't use Synchronizing that much).

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690305 is a reply to message #690252]

Wed, 29 June 2011 10:38

Dariusz Luksza

Messages: 40
Registered: July 2010

Member

It could sounds a little bit strange, but Manuel you are also right Wink

To clarify things. Before 1.0 synchronize view doesn't fetch changes from remote, because of that to get incoming changes you need to fetch them on your one. In 1.0 EGit will automatically fetch changes if given branch is remote or local branch has configured to track remote one.

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690344 is a reply to message #690305]

Wed, 29 June 2011 12:01

R Shapiro

Messages: 386
Registered: June 2011

Senior Member

Fortunately there's a preference to disable the auto-fetch, so you can still do an offline compares if you want to. To me the main point of these kinds of branches is that they're accessible offline (compare Mercurial, which must always be online for a comparison of this kind).

See Preferences -> Team -> Git.

Ideally it would be a second checkbox in the Synchronization dialog, initialized by the preference but modifiable on the fly for each Synchronization.

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690367 is a reply to message #690344]

Wed, 29 June 2011 12:48

Dariusz Luksza

Messages: 40
Registered: July 2010

Member

R Shapiro wrote on Wed, 29 June 2011 08:01

Ideally it would be a second checkbox in the Synchronization dialog, initialized by the preference but modifiable on the fly for each Synchronization.

Good idea! I'll try to implement it in nearest feature Wink

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690521 is a reply to message #690367]

Wed, 29 June 2011 16:15

R Shapiro

Messages: 386
Registered: June 2011

Senior Member

A possibly related question re: Team -> Synchronize

One of my workspaces includes an Git SVN bridge, resulting in references like remotes/trunk. I would like to synchronize my active branch against this, of course with auto-fetch disabled (obviously 'fetch' won't work here).

The Synchronize dialog presents me with 'refs/remotes/trunk' as a choice but does not allow me to proceed if I select it. Why is that? Shouldn't Synchronize be able to work with this? I understand that jgit doesn't currently support the git svn operations and so egit can't either. But no svn operations are involved here: 'refs/remotes/trunk' is an ordinary git reference like any other, a text file with a SHA string in it.

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690619 is a reply to message #690521]

Wed, 29 June 2011 20:48

Dariusz Luksza

Messages: 40
Registered: July 2010

Member

This sounds like a strange bug in synchronize wizard, could you open a bug for it?

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #690900 is a reply to message #690619]

Thu, 30 June 2011 11:55

R Shapiro

Messages: 386
Registered: June 2011

Senior Member

Bug reported, as requested. See https://bugs.eclipse.org/bugs/show_bug.cgi?id=350804

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #819982 is a reply to message #690900]

Tue, 13 March 2012 15:22

Harry Houdini

Messages: 142
Registered: February 2010

Senior Member

Could you please confirm that Team > Synchronize implements the command git diff HEAD ?

Thanks.

Report message to a moderator

Re: Setting up Synchronisation with Remote Repository [message #820010 is a reply to message #819982]

Tue, 13 March 2012 16:10

Dariusz Luksza

Messages: 40
Registered: July 2010

Member

The default configuration will also fetch data from origin/remote-tracking-branch so it is more like:
git fetch && git diff FETCH_HEAD

If you disable 'automatic fetch option' it should behave as you said: git diff HEAD

Report message to a moderator