Bug 381844 - Setting up an upstream branch causes team/synchronize_workspace to not work
Summary: Setting up an upstream branch causes team/synchronize_workspace to not work
Status: NEW
Alias: None
Product: EGit
Classification: Technology
Component: Core (show other bugs)
Version: 1.3   Edit
Hardware: PC Windows 7
: P3 normal (vote)
Target Milestone: ---   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-06-06 07:26 EDT by Rafal Rusin CLA
Modified: 2012-08-07 08:19 EDT (History)
0 users

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 Rafal Rusin CLA 2012-06-06 07:26:58 EDT 
Build Identifier: M20120208-0800

After setting up an upstream branch and switching to it, team/synchronize_workspace no longer works.
The operation causes nothing.


Reproducible: Always

Steps to Reproduce:
Reproduction steps:
1. Attach a project to local git repo
2. Create an upstream branch (git branch test --track remotes/something) and check it out.
3. Right click on a project in eclipse and pick team/synchronize_workspace.

The operation will cause nothing.
The workaround is to comment out "merge" flag on the branch in .git/config.
Comment 1 Rafal Rusin CLA 2012-08-07 08:19:05 EDT 
I updated to latest egit and this time it's looping here:


Worker-253" prio=6 tid=0x0000000007c70800 nid=0x1ac0 runnable [0x000000002650e000]
   java.lang.Thread.State: RUNNABLE
	at org.eclipse.core.internal.resources.Resource.getFullPath(Resource.java:1100)
	at org.eclipse.core.internal.localstore.FileSystemResourceManager.getStoreRoot(FileSystemResourceManager.java:528)
	at org.eclipse.core.internal.localstore.FileSystemResourceManager.locationFor(FileSystemResourceManager.java:754)
	at org.eclipse.core.internal.resources.Resource.getLocation(Resource.java:1122)
	at org.eclipse.core.internal.localstore.FileSystemResourceManager.resourceForLocation(FileSystemResourceManager.java:285)
	at org.eclipse.core.internal.localstore.FileSystemResourceManager.fileForLocation(FileSystemResourceManager.java:472)
	at org.eclipse.core.internal.resources.WorkspaceRoot.getFileForLocation(WorkspaceRoot.java:137)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForFile(GitContainerMapping.java:69)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:62)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.createTraversalForContainer(GitContainerMapping.java:60)
	at org.eclipse.egit.ui.internal.synchronize.mapping.GitContainerMapping.getTraversals(GitContainerMapping.java:47)
	at org.eclipse.team.core.mapping.provider.SynchronizationScopeManager.addMappingsToScope(SynchronizationScopeManager.java:389)
	at org.eclipse.team.core.mapping.provider.SynchronizationScopeManager.addResourcesToScope(SynchronizationScopeManager.java:308)
	at org.eclipse.team.core.mapping.provider.SynchronizationScopeManager.performExpandScope(SynchronizationScopeManager.java:279)
	at org.eclipse.team.core.mapping.provider.SynchronizationScopeManager.internalRefreshScope(SynchronizationScopeManager.java:239)
	at org.eclipse.team.core.mapping.provider.SynchronizationScopeManager.access$1(SynchronizationScopeManager.java:221)
	at org.eclipse.team.core.mapping.provider.SynchronizationScopeManager$2.run(SynchronizationScopeManager.java:181)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
	at org.eclipse.team.core.mapping.provider.SynchronizationScopeManager.refresh(SynchronizationScopeManager.java:179)
	at org.eclipse.team.core.subscribers.SubscriberScopeManager.access$1(SubscriberScopeManager.java:1)
	at org.eclipse.team.core.subscribers.SubscriberScopeManager$2.run(SubscriberScopeManager.java:95)
	at org.eclipse.core.internal.resources.Workspace.run(Workspace.java:2344)
	at org.eclipse.team.core.subscribers.SubscriberScopeManager.refresh(SubscriberScopeManager.java:93)
	at org.eclipse.team.core.mapping.provider.SynchronizationContext.refresh(SynchronizationContext.java:107)
	at org.eclipse.team.internal.ui.synchronize.RefreshModelParticipantJob.doRefresh(RefreshModelParticipantJob.java:69)
	at org.eclipse.team.internal.ui.synchronize.RefreshParticipantJob.run(RefreshParticipantJob.java:309)
	at org.eclipse.team.internal.ui.synchronize.RefreshModelParticipantJob.run(RefreshModelParticipantJob.java:117)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:54)

   Locked ownable synchronizers:
	- None