Eclipse Community Forums: EGit / JGit » Staging view shows unchanged files

Help

Home

Home » Eclipse Projects » EGit / JGit » Staging view shows unchanged files

Show: Today's Messages :: Show Polls :: Message Navigator

Staging view shows unchanged files [message #749462]

Tue, 25 October 2011 08:29

Martin Fluegge

Messages: 141
Registered: July 2009

Senior Member

Hi everybody,

I have a problem with the Staging View. For an unknown reason the view
sometimes shows files, that are not dirty at all and which I have not
modified. These files are listed as unstaged changes and also appear
dirty in the package explorer. The compare editor also reveals that the
files are not changed. Often it happens that in the case “Replace with
File in Git index” does not do anything. The file stays marked dirty.

Anyone else facing the same problem or has an idea what to do in this case?

Thanks in advance.

Cheers,

Martin

Report message to a moderator

Re: Staging view shows unchanged files [message #749659 is a reply to message #749462]

Tue, 25 October 2011 11:00

Matthias Sohn

Messages: 1268
Registered: July 2009

Senior Member

Which version of EGit are you using here ?
Did you try with the nightly build version (we did
some fixes in JGit's git index handling recently) ?

Report message to a moderator

Re: Staging view shows unchanged files [message #749889 is a reply to message #749659]

Tue, 25 October 2011 13:53

Martin Fluegge

Messages: 141
Registered: July 2009

Senior Member

Hi Matthias,

thanks for the quick response. Additional comments inline...

Am 25.10.2011 13:00, schrieb Matthias Sohn:
> Which version of EGit are you using here ?

I am using 1.1.0.201109151100-r

> Did you try with the nightly
> build version (we did
> some fixes in JGit's git index handling recently) ?

Thanks for the hint. I'll update to the nightly version and let you know
if the problem still exists.

Cheers,

Martin

Report message to a moderator

Re: Staging view shows unchanged files [message #753345 is a reply to message #749889]

Wed, 26 October 2011 09:08

Martin Fluegge

Messages: 141
Registered: July 2009

Senior Member

Hi Matthias,

since I've updated to the nightly build the error did not appear again.
Thanks.

Cheers,

Martin

Am 25.10.2011 15:53, schrieb Martin Flügge:
> Hi Matthias,
>
> thanks for the quick response. Additional comments inline...
>
> Am 25.10.2011 13:00, schrieb Matthias Sohn:
>> Which version of EGit are you using here ?
>
> I am using 1.1.0.201109151100-r
>
>> Did you try with the nightly
>> build version (we did
>> some fixes in JGit's git index handling recently) ?
>
>
> Thanks for the hint. I'll update to the nightly version and let you know
> if the problem still exists.
>
> Cheers,
>
> Martin

Report message to a moderator

Re: Staging view shows unchanged files [message #760342 is a reply to message #753345]

Fri, 02 December 2011 01:32

Mark Dexter

Messages: 324
Registered: July 2009

Senior Member

Hi. I have the same problem and tried to install from the Nightly link at http://download.eclipse.org/egit/updates-nightly. I'm not 100% sure how to do it, but what I did was do Help->Install New Software->Add and added the nightly link. Then I went to Help->Check For Updates and it shows the updates, but I get this message below. This seems to indicate that I can't have two versions of the Git Team Provider installed. I also tried install new software and I get the same message. I also tried uninstalling the egit and jgit stuff and then installing new from the nightly site and got the same result.

Am I doing something wrong or is something amiss with the nightly update site? Thanks. Mark Dexter

Cannot complete the install because of a conflicting dependency.
Software being installed: Eclipse EGit 1.2.0.201112010521 (org.eclipse.egit.feature.group 1.2.0.201112010521)
Software currently installed: Eclipse EGit Mylyn GitHub Feature 1.1.0.201109151100-r (org.eclipse.mylyn.github.feature.feature.group 1.1.0.201109151100-r)
Only one of the following can be installed at once:
Git Team Provider UI 1.1.0.201109151100-r (org.eclipse.egit.ui 1.1.0.201109151100-r)
Git Team Provider UI 1.2.0.201112010521 (org.eclipse.egit.ui 1.2.0.201112010521)
Cannot satisfy dependency:
From: Eclipse EGit 1.2.0.201112010521 (org.eclipse.egit.feature.group 1.2.0.201112010521)
To: org.eclipse.egit.ui
Cannot satisfy dependency:
From: Eclipse EGit Mylyn GitHub Feature 1.1.0.201109151100-r (org.eclipse.mylyn.github.feature.feature.group 1.1.0.201109151100-r)
To: org.eclipse.mylyn.github.ui [1.1.0.201109151100-r]
Cannot satisfy dependency:
From: Mylyn GitHub Connector UI 1.1.0.201109151100-r (org.eclipse.mylyn.github.ui 1.1.0.201109151100-r)
To: package org.eclipse.egit.ui [1.1.0,1.2.0)

Report message to a moderator

Re: Staging view shows unchanged files [message #761864 is a reply to message #760342]

Wed, 07 December 2011 07:53

Matthias Sohn

Messages: 1268
Registered: July 2009

Senior Member

The Github connector has a different p2 repository. Since you installed Github connector 1.1 this still needs JGit 1.1 but you try to update to EGit 1.2 which requires JGit 1.2. Try also adding Github connector's nightly p2 repository http://download.eclipse.org/egit/github/updates-nightly and then retry to update.

Report message to a moderator

Previous Topic:	How to configure default merge strategy?
Next Topic:	support for lightweight tags?

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue Apr 23 05:31:55 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter