Eclipse Community Forums: EGit / JGit » Diff between a current state of a file and the commited version

Home » Eclipse Projects » EGit / JGit » Diff between a current state of a file and the commited version

Diff between a current state of a file and the commited version [message #758453]

Wed, 23 November 2011 05:44

Eclipse User

Hello,

When I was using SVN, in order to have a view of my modifications on a file before any commit, I used Team/Synchronize.

In EGit, I'd like to be able to compare the current state of a file, and the last commit I did locally.

It seems that view Team/Synchronize compare only with the file on the server.

[Updated on: Wed, 23 November 2011 06:19] by Moderator

Re: Diff between a current state of a file and the commited version [message #758519 is a reply to message #758453]

Wed, 23 November 2011 09:47

Eclipse User

You want "Team -> Synchronize Workspace" in this case, not "Team -> Advanced-> Synchronize". The first one compares your working directory to the Index. The second one compares the active branch to some other reference. You get the advanced version if run the "Synchronize..." toolbar item.

Or consider using the 'Git Staging' view instead of the synchronization perspective. I find it much handier for this purpose.

Re: Diff between a current state of a file and the commited version [message #758567 is a reply to message #758519]

Wed, 23 November 2011 12:34

Eclipse User

Quote:

It seems that view Team/Synchronize compare only with the file on the server.

Oodini, what do you mean by "compare only with the file on the server" ?

Quote:

You want "Team -> Synchronize Workspace" in this case, not "Team -> Advanced-> Synchronize". The first one compares your working directory to the Index. The second one compares the active branch to some other reference. You get the advanced version if run the "Synchronize..." toolbar item.

Actually "Team -> Synchronize workspace" will compare yours local working copy with HEAD version (not against git index). In "Workspace" presentation model all changes that are in git index and in yours working copy will be squash together, if you will switch to "Git Commits" model changes will be spited into "<working tree>" and "<staged changes>".

Same rules apply to "Team -> Advance -> Synchronize" with a slightly difference. In this case you can also see changes from other commits that are in one branch but not in the other one. Also "Workspace" presentation model will squash all changes together, but "Git Commits" model will show additional commit nodes for each commit and will present changes introduced by this commit inside this node.

Re: Diff between a current state of a file and the commited version [message #758596 is a reply to message #758567]

Wed, 23 November 2011 14:55

Eclipse User

re: "Team -> Synchronize workspace" will compare yours local working copy with HEAD version (not against git index)"

Right, sorry, I garbled what I had in mind, which was that this view lets you add and/remove un-commited changes to/from the Index.

I think we can take for granted that "compare with file on the server" means "compare with the version in the corresponding branch of the origin repository". This is the closest equivalent to what the SVN team providers do in this perspective.

Re: Diff between a current state of a file and the commited version [message #758607 is a reply to message #758596]

Wed, 23 November 2011 15:41

Eclipse User

R Shapiro wrote on Wed, 23 November 2011 14:55

I think we can take for granted that "compare with file on the server" means "compare with the version in the corresponding branch of the origin repository". This is the closest equivalent to what the SVN team providers do in this perspective.

Yes in deed, but from the context I understood that "comparing with remote branch" is not a desired result of synchronize action.

Re: Diff between a current state of a file and the commited version [message #759028 is a reply to message #758607]

Fri, 25 November 2011 11:35

Eclipse User

OK, guys, thanks a lot for the info !

Previous Topic:	workaround for the broken aspect of refs/remotes
Next Topic:	How to ignore SSL certificates?

Goto Forum:

-=] Back to Top [=-

Current Time: Fri Jul 25 16:55:14 EDT 2025

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter