Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 336177 - Not possible to compare in Synchronize View synchronizing with a branch other than HEAD
Summary: Not possible to compare in Synchronize View synchronizing with a branch other...
Status: CLOSED DUPLICATE of bug 337198
Alias: None
Product: EGit
Classification: Technology
Component: UI (show other bugs)
Version: unspecified   Edit
Hardware: All All
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2011-02-02 18:38 EST by Andrew Gvozdev CLA
Modified: 2011-02-28 13:08 EST (History)
2 users (show)

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Andrew Gvozdev CLA 2011-02-02 18:38:35 EST 
I am trying to synchronize HEAD with local uncommitted changes against another branch. I switched to All models where I can see the list of files. There are 2 problems:
- Doubleclick on a file is not opening compare editor neither in Workspace model nor in Java model.
- "Compare with -> HEAD revision" from context menu always compares local uncommitted against HEAD not with the branch I synchronize with.

Ideally I'd like to be able to edit my local files in workspace in the compare editor.

  Eclipse EGit (Incubation)	0.11.0.201102020324	org.eclipse.egit.feature.group
  Eclipse JGit (Incubation)	0.11.0.201102011652	org.eclipse.jgit.feature.group
Comment 1 Andrew Gvozdev CLA 2011-02-02 18:41:59 EST 
(In reply to comment #0)
> - "Compare with -> HEAD revision" from context menu always compares local
> uncommitted against HEAD not with the branch I synchronize with.
I should've said that there is only "Compare with HEAD" option but no "Compare with the branch I synchronize with" in the context menu. "Compare with HEAD" is pretty useless in this context.
Comment 2 Andrew Gvozdev CLA 2011-02-03 17:33:06 EST 
On closer look it just always synchronize against current HEAD. The destination branch I specify in Synchronize dialog is being ignored.
Comment 3 Andrew Gvozdev CLA 2011-02-03 17:35:07 EST 
(In reply to comment #2)
> On closer look it just always synchronize against current HEAD. The destination
> branch I specify in Synchronize dialog is being ignored.
Strike that, I was to quick to fire. My mistake, I used similarly named branch matching HEAD.
Comment 4 Dariusz Luksza CLA 2011-02-28 09:56:59 EST 
(In reply to comment #0)
>   Eclipse EGit (Incubation)    0.11.0.201102020324   
> org.eclipse.egit.feature.group
>   Eclipse JGit (Incubation)    0.11.0.201102011652   
> org.eclipse.jgit.feature.group

This should be fixed in 0.11.3, could you check it on newest stable version of EGit?
Comment 5 Andrew Gvozdev CLA 2011-02-28 10:39:43 EST 
Yes it's working now. Thanks for the fix!
Comment 6 Dariusz Luksza CLA 2011-02-28 13:08:41 EST 
Thank you for checking that ;)

*** This bug has been marked as a duplicate of bug 337198 ***