Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 336085

Summary:	Rebase does not work after fetch from repository on remote share without local changes
Product:	[Technology] EGit	Reporter:	Thomas Bieser <thomas.bieser>
Component:	Core	Assignee:	Project Inbox <egit.core-inbox>
Status:	RESOLVED FIXED	QA Contact:
Severity:	major
Priority:	P3	CC:	b.kolb, caniszczyk, christian.halstrick, matthias.sohn
Version:	unspecified
Target Milestone:	---
Hardware:	PC
OS:	Windows 7
Whiteboard:

Description Thomas Bieser

2011-02-02 10:59:10 EST

Build Identifier: 0.10.1

Context
- Freshly installed eclipse and EGit
- Remote repository is pointing to shared folder on other Windows 7 PC
- Changes in project in remote repository on other PC have been committed but not yet fetched to local repository
- Clean working tree in local repository, i.e. no changes made to project


Reproducible: Always

Steps to Reproduce:
1. Fetch from remote repository: There was a change that was fetched
2. Run rebase: Try to rebase local master to remote origin/master
3. Expected: Fetched changes added to local master, local master fast forwarded
4. Actual Result: No changes added
5. Fix / Workaround: A merge of origin/master into local master worked

Comment 1 Matthias Sohn

2011-02-03 07:42:02 EST

Please retry with latest nightly build, this problem was fixed already [1].

[1] http://egit.eclipse.org/r/#change,2364