{"thread":{"id":"15893","subject":"EGIT compare editor","startedAt":"2008-10-14T14:18:27Z","lastAt":"2011-03-08T21:01:47Z","messageCount":3,"participants":["Chris Dumoulin","Shawn O. Pearce","chrismarx"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"93006","messageId":"48F4AA33.40605@oanda.com","threadId":"15893","inReplyTo":null,"subject":"EGIT compare editor","fromName":"Chris Dumoulin","fromEmail":"dumoulin@oanda.com","sentAt":"2008-10-14T14:18:27Z","receivedAt":"2008-10-14T14:18:27Z","isPatch":false,"sender":{"key":"dumoulin@oanda.com","avatar":null},"body":"I seem to have successfully installed EGIT in Eclipse 3.4.1, but I can't \nfigure out how to bring up the compare editor to view diffs.\n\nThe EGIT plugin seems to be loaded and working for my project; I see \n\"[Git @ master]\" beside the project name, and \">\" beside changed files. \nAlso, the quickdiff seems to be working; I see a different colour in the \nleft margin beside changes within the file. The \"Team\" context menu \nseems to be populated properly: \"Commit\", \"Update Index (Refresh)\", \n\"Show in Resource History\", \"Assume unchanged\", \"Track (Add)\", \"Untrack \n(Remove)\", \"Apply Patch...\", and below the separator \"Show Local History\".\n\nI expect that after right-clicking on a changed file, I would have some \noption under \"Compare With\" or \"Team\" that would allow me to diff the \ncurrent file against the HEAD or some other revision using the compare \neditor, but I can't seem to find any way to do this. How do I bring up \nthe compare editor to view diffs?\n\nThanks,\nChris\n"},{"id":"93010","messageId":"20081014150501.GD4856@spearce.org","threadId":"15893","inReplyTo":"48F4AA33.40605@oanda.com","subject":"Re: EGIT compare editor","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2008-10-14T15:05:01Z","receivedAt":"2008-10-14T15:05:01Z","isPatch":false,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"Chris Dumoulin <dumoulin@oanda.com> wrote:\n> I seem to have successfully installed EGIT in Eclipse 3.4.1, but I can't  \n> figure out how to bring up the compare editor to view diffs.\n>\n> I expect that after right-clicking on a changed file, I would have some  \n> option under \"Compare With\" or \"Team\" that would allow me to diff the  \n> current file against the HEAD or some other revision using the compare  \n> editor, but I can't seem to find any way to do this. How do I bring up  \n> the compare editor to view diffs?\n\nRobin knows the Eclipse integration better than I, but we may be\nmissing the feature to compare the working directory revision to\nthe last committed revision (or the index revision).\n\nI'm pretty sure the compare editor is available in the History view\n(Team -> Show resource in History) by double clicking the file\npath when a commit node is selected.  But that's obviously only\nhistorical diffs.\n\n-- \nShawn.\n"},{"id":"163018","messageId":"1299618107193-6142419.post@n2.nabble.com","threadId":"15893","inReplyTo":"20081014150501.GD4856@spearce.org","subject":"Re: EGIT compare editor","fromName":"chrismarx","fromEmail":"chrismarx@gmail.com","sentAt":"2011-03-08T21:01:47Z","receivedAt":"2011-03-08T21:01:47Z","isPatch":false,"sender":{"key":"chrismarx@gmail.com","avatar":null},"body":"This thread is really high in google searches, and threw me off when I first\nstarted using git. I think most people who are finding this thread are\nprobably wanting to know how to compare files with egit, or why they can't\nsee the compare functionality at all. \n\nIf you're using egit, and your project is setup properly in eclipse, then\nyou should be able to just right-click and compare-with (head, etc). If you\ndon't see this option, perhaps you're project isn't actually being managed\nby egit. check that the project name has something like [yourproject\nmaster/branch] attached the tittle, and that under \"Team\" (right click on\nproject) you're seeing git options/commands. If not, try team-share and hook\nup your project to the right repository. \n\nOfficial reference guide is here -\nhttp://help.eclipse.org/helios/index.jsp?topic=/org.eclipse.egit.doc/help/EGit/User_Guide/Inspecting-the-state-of-the-Repository.html\n\n--\nView this message in context: http://git.661346.n2.nabble.com/EGIT-compare-editor-tp1332809p6142419.html\nSent from the git mailing list archive at Nabble.com.\n"}]}