Skip to main content


Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » How to compare a file with the history?
How to compare a file with the history? [message #10919] Tue, 21 July 2009 16:55 Go to next message
Dmitry Smirnov is currently offline Dmitry SmirnovFriend
Messages: 92
Registered: July 2009
Member
Hi,

I'm trying to compare the file in my working tree with some entry in the
history (Resource History)

For most other version control plusgins I can do this with the Compare
With. Egit provides only comparision with the Git Index.

Also, there are few context menu options in Resource History (like "set as
quickdiff baseline") but I do not know what it means (perhaps because I'm
new to Git).

Dmitry

Report message to a moderator

Re: How to compare a file with the history? [message #10947 is a reply to message #10919] Tue, 21 July 2009 23:35 Go to previous message
Shawn O. Pearce is currently offline Shawn O. PearceFriend
Messages: 82
Registered: July 2009
Member
Dmitry Smirnov wrote:
> I'm trying to compare the file in my working tree with some entry in the
> history (Resource History)
>
> For most other version control plusgins I can do this with the Compare
> With. Egit provides only comparision with the Git Index.


Yes, the compare with Resource History feature is missing from EGit
currently. So only the comparison to the index is offered.

> Also, there are few context menu options in Resource History (like "set
> as quickdiff baseline") but I do not know what it means (perhaps because
> I'm new to Git).

The quickdiff viewer shows a ruler down the margin of a text editor
indicating which lines differ from some base revision. Typically this
is used to show what you have modified in this file, but have not yet
committed. That menu option lets you select something other than HEAD.

You need to enable Git as the quickdiff provider in the workspace
preferences for this to work, and sadly only one quickdiff provider can
be enabled per workspace, so if you use both CVS and Git projects in the
same workspace you are forced to pick only one quickdiff provider for
all files.

Report message to a moderator

Re: How to compare a file with the history? [message #573645 is a reply to message #10919] Tue, 21 July 2009 23:35 Go to previous message
Shawn O. Pearce is currently offline Shawn O. PearceFriend
Messages: 82
Registered: July 2009
Member
Dmitry Smirnov wrote:
> I'm trying to compare the file in my working tree with some entry in the
> history (Resource History)
>
> For most other version control plusgins I can do this with the Compare
> With. Egit provides only comparision with the Git Index.


Yes, the compare with Resource History feature is missing from EGit
currently. So only the comparison to the index is offered.

> Also, there are few context menu options in Resource History (like "set
> as quickdiff baseline") but I do not know what it means (perhaps because
> I'm new to Git).

The quickdiff viewer shows a ruler down the margin of a text editor
indicating which lines differ from some base revision. Typically this
is used to show what you have modified in this file, but have not yet
committed. That menu option lets you select something other than HEAD.

You need to enable Git as the quickdiff provider in the workspace
preferences for this to work, and sadly only one quickdiff provider can
be enabled per workspace, so if you use both CVS and Git projects in the
same workspace you are forced to pick only one quickdiff provider for
all files.

Report message to a moderator

Previous Topic:Executable flags
Next Topic:JGit?
Goto Forum:
  

[ Syndicate this forum (XML) ] [ RSS ]

Current Time: Thu Apr 25 02:14:14 GMT 2024

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

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

Back to the top

Sign up to our Newsletter

A fresh new issue delivered monthly