Community
Participate
Working Groups
org.eclipse.egit.ui_1.1.0.201108230343.jar Maybe I did something wrong in the setup but it's weird: - I have my project imported from master [good] - I compare my project with local master: no change [good] - I compare my project with remote master: no change [good] - but Team > Synchronize gives me hundred changes in the Synchronize view - Merge says: no changes to merge - pull does not help - push says: it's up to date I'm new to EGit, so I might have done something wrong or understood something wrong (or maybe the repo which was migrated from CVS is broken) but the fact that compare and the Synchronize view show such a different state looks like a severe bug and at this point I have no clue how to bring the Synchronize view into a usable state. Repo: ssh://userid@git.eclipse.org/gitroot/platform/eclipse.platform.text.git
Created attachment 202079 [details] Picture of my workbench
Created attachment 202080 [details] Picture of my workbench
Dani, it would be interesting to see your sync view in the Git Change Set Mode to see where these changes come from.
(In reply to comment #3) > Dani, it would be interesting to see your sync view in the Git Change Set Mode > to see where these changes come from. Sure. How do I do this?
I suspect your are using autocrlf settings which aren't yet supported (see bug 301775)
(In reply to comment #5) > I suspect your are using autocrlf settings which aren't yet supported (see bug > 301775) I didn't change any preference. >Dani, it would be interesting to see your sync view in the Git Change Set Mode >to see where these changes come from. Mmh: in that mode the view says that there are no change (sigh!), but that the Java Workspace has incoming/outgoing changes.
(In reply to comment #6) > (In reply to comment #5) > > I suspect your are using autocrlf settings which aren't yet supported (see bug > > 301775) > I didn't change any preference. I just verified that this is set to 'false'.
1. delete the project 2. hard reset local master 3. import the project again ==> same problem.
I gave up (but kept the old workspace) and restarted with a new workspace. This time the result was better at the beginning: The Synchronize view is empty this time. BUT 1. after a change I get an outgoing change with a '>' [good] 2. commit ==> the file stays in the view but the '>' goes away [good???] 3. I push the change and get a dialog that confirms it worked [good] 4. BUT: the changed file still stays in the Synchronize view [bad] ==> no way to get rid of that file and again, the change set view says there's no change, except for the Java Workspace.
I gave up on the latest and greatest (201108230343) and switched to org.eclipse.egit.ui_1.0.0.201106090707-r which seems to work better. The scenario from comment 9 works like a charm. So, while I found a way around the problem it still remains a BLOCKER regarding 201108230343.
(In reply to comment #9) > 4. BUT: the changed file still stays in the Synchronize view [bad] > ==> no way to get rid of that file and again, the change set view says > there's > no change, except for the Java Workspace. It seams that after commit '521e41c [sync] Simplify implementation of git remote objects' the workspace model wasn't properly refreshed after repository change event. I've already pushed fix for this issue[1]. [1] http://egit.eclipse.org/r/4069
(In reply to comment #11) > (In reply to comment #9) > > 4. BUT: the changed file still stays in the Synchronize view [bad] > > ==> no way to get rid of that file and again, the change set view says > > there's > > no change, except for the Java Workspace. > > It seams that after commit '521e41c [sync] Simplify implementation of git > remote objects' the workspace model wasn't properly refreshed after repository > change event. I've already pushed fix for this issue[1]. > > [1] http://egit.eclipse.org/r/4069 Should this be in the latest N-build? I just tried again using Eclipse EGit 1.1.0.201108251914 from http://download.eclipse.org/egit/updates-nightly and the problem is still there.
Closing and redoing the synchronization does not fix the problem, but after a restart it works (until I commit again).
(In reply to comment #12) > Should this be in the latest N-build? I just tried again using Eclipse EGit > 1.1.0.201108251914 from http://download.eclipse.org/egit/updates-nightly and > the problem is still there. No this change isn't merged into master. It just awaiting for a review, it needs to be accepted by another EGit commiter to be available in nightly build
merged as http://egit.eclipse.org/w/?p=egit.git;a=commit;h=294c1aa428a1859208dfc4cc43c1cfb45eff26d5
Verified in 1.1.0.201108281957.
Sorry for this intrusion. I found a similar problem for Subversive using Eclipse 3.7: after committing a file, it still looks like modified in the Synchronize View. It is also marked as ">" in the Package/Project Explorer. Anyway, changes have been committed, as I can see in the SVN Repository Explorer. Doing a Team => Cleanup does not help. Closing and reopening the project does not help. If I look at the file revisions, they are the latest ones. I have to close and restart Eclipse to see the files as not modified correctly! This has started to happen with Eclipse 3.7. I have similar problems (synchronize view not refreshing after commit) using CVS too. I never had such problems with 3.6. My question is: maybe there was a change in the Team API that caused this? Could be the problems I see with Subversive and CVS related to this EGit problem? Any help would be appreciated, because I can't provide steps to reproduce this consistently and the problem is severe...
