Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Newbie "how to": Preview incoming changes like cvs/svn Synchronize
Newbie "how to": Preview incoming changes like cvs/svn Synchronize [message #667580] Fri, 29 April 2011 15:22 Go to next message
Eric Rizzo is currently offline Eric RizzoFriend
Messages: 2371
Registered: July 2009
Senior Member
I'm a total newb to git and Egit and have been frustrated by my
inability to reproduce the Synchronize behavior that I've been using for
years with Eclipse's cvs and svn clients.
I cloned a GitHub repository a while back (using EGit) and imported the
project into Eclipse. Since then, I made some local changes (that I
don't really care about, no need to push them or anything like that),
but there have also been changes in the GitHub repository. What I need
is to preview the "incoming" changes that have been made in the remote
repo like I would do on a cvs project with Team > Synchronize With
Repository.
I've tried Team > Synchronize... on the git project, but no matter what
I select in the resulting dialog, I never see any incoming changes. For
the "origin" repo, the only "Ref" choice seems to be "master," while for
<local.git> the "Ref" choices are "HEAD" and "master."

Can anyone give a step-by-step for how to reproduce the functionality of
cvs "Synchronize with Repository" for an EGit-managed project?

Thanks,
Eric
Re: Newbie "how to": Preview incoming changes like cvs/svn Synchronize [message #667801 is a reply to message #667580] Mon, 02 May 2011 09:51 Go to previous messageGo to next message
sylvain.pras is currently offline sylvain.prasFriend
Messages: 9
Registered: April 2011
Junior Member
Personnaly i no more use the synchronise view ... because all the the files modified in a commit are visibles in the history view when you select a commit.

Nevertheless i think you should use Destination : origin Ref : master
or make "Fetch from" then synchronise with Destination <local branch> Ref : <master>

hope it helps you
Re: Newbie "how to": Preview incoming changes like cvs/svn Synchronize [message #667842 is a reply to message #667580] Mon, 02 May 2011 12:33 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 612
Registered: July 2009
Senior Member
Did you run "Fetch from upstream" before running "Synchronize" ? This is required to transfer the new changes from the server to your local repository. Dariusz plans to implement a combination of these two steps during his GSoC project [1] in order to improve usability.

[1] http://www.google-melange.com/gsoc/project/google/gsoc2011/d ariusz_luksza/18001
Re: Newbie "how to": Preview incoming changes like cvs/svn Synchronize [message #672410 is a reply to message #667580] Fri, 20 May 2011 23:32 Go to previous message
Alexi  is currently offline Alexi Friend
Messages: 3
Registered: March 2011
Junior Member
One way I achieve something like this is by doing a 'mixed reset'
Project > Team > Reset > (select remote/origin & Reset Type: Mixed)

Then I diff the Eclipse project root against the git index:
Project > Compare With > Git Index

You will see a 'Git Tree Compare' panel where you go through the files and merge in the changes... Not as elegant as Subclipse but it seems to work.
Previous Topic:Problems with the Synchronize Workflow
Next Topic:Newbie questions
Goto Forum:
  


Current Time: Wed Nov 26 16:43:42 GMT 2014

Powered by FUDForum. Page generated in 0.01838 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software