David,
Perhaps EGit "helps out" so you didn't see the issue. I typically work directly from the Git command-line or use GUI tools, like TortoiseGit, or SourceTree. All three reported the issue. None of the other Git repos I use have ever gotten into that state. At least one of them is fairly active and receives regular cross-platform commits. The two platforms I'm using that had the issue were Windows and Mac OSx. Although I do have a linux box available I didn't check it.
Thanks for looking into it. I wasn't intending to sound snarky. I'd originally believed it to be a windows issue - not playing well with Git. However, when the Mac command-line tools also reported the same results I became a bit more worried. Though not finding any other reports of the issue was also odd. I just thought I bring it to folks attention, and see if there was something obvious I was missing.
I'll clone again in the morning and see if I still see the issue.
Thanks again.
Eric
Do people who always have to "deal
with the consequences" use Windows? Linux? Mac?
Do they use EGit or command line?
I ask, since I do not see the problem
you describe, using Linux and EGit.
But, I did look closely at the file,
and see that it had mixed line endings (some "windows" CRLF and
some "linux" LF).
This, in turn, makes me wonder if participants
have read
http://wiki.eclipse.org/Simrel/Contributing_to_Simrel_Aggregation_Build#Configuring_the_repo
and
http://wiki.eclipse.org/Simrel/Contributing_to_Simrel_Aggregation_Build#Configuring_the_workspace_content_types
In short, use autocrlf=false and define
your content types and/or associate the file types with text editors.
autocrlf=false should prevent a "change"
from occurring on checkout, and having correct content types defined make
it easy to fix using "Convert Line Delimiters To ... ". If you're
the CLI only type, you'd have to use "dos2unix" to fix.
I have corrected the delimiters (so
it is now no longer a "test case") ... but, having the repo configured
correctly will help avoid it in future and make it possible for you, participants,
to fix files in the future, if it happens again.
Maybe we should add a reminder "test
case" file, with deliberate mixed line endings that'd say "if
you see this file as changed, you need to set autocrlf=false"? :)
At least, I'm assuming that was (one of) the problems ... like I
said, I've not actually seen the issue.
HTH
From:
Eric Gwin <eric.gwin@xxxxxxxxxx>
To:
Cross project issues
<cross-project-issues-dev@xxxxxxxxxxx>,
Date:
01/18/2013 07:09 PM
Subject:
Re: [cross-project-issues-dev]
Corrupt Simrel repo???
Sent by:
cross-project-issues-dev-bounces@xxxxxxxxxxx
Hi,
I understand that the message is usually a standard Git protection to keep
me from inadvertently overwriting edited files. However, my point is I
haven't edited the file. Ever. It "comes" edited when the repo
is cloned. Therefore, I surmise that the file is, in fact, corrupt in the
repo, and everyone using that repo is having to deal with the consequences.
It would be nice if it were fixed.
Eric
On 2013-01-18, at 4:54 PM, Ed Willink <ed@xxxxxxxxxxxxx> wrote:
> Hi
>
> This is standard GIT protection for edited files.
>
> As the message says you must either preserve of lose the changed files.
>
> To lose it/them just replace all files shown in the Staging View by
HEAD. Then you're good to go.
>
> Regards
>
> Ed Willink
>
> On 18/01/2013 21:45, Benjamin Cabé wrote:
>> FWIW I have the very same issue, so sth is probably wrong in the
git repo itself indeed...
>>
>> Benjamin
>>
>> Eric Gwin<eric.gwin@xxxxxxxxxx> a écrit :
>>
>>
>> Ok. got past it again by "unstaging" the file. and was
able to checkout the Juno branch, but it should still probably be looked
into.
>>
>> -Eric
>>
>> On 18/01/2013 2:14 PM, Eric Gwin wrote:
>>> David,
>>>
>>> For a while now I've been having trouble switching my simrel
branch. I thought it was just my system, but tried from another system
recently. Any attempt to switch to the Juno_maintenance branch is giving
me:
>>>
>>> "error: Your local changes to the following files would
be overwritten by checkout:
>>> soa-bpel.b3aggrcon
>>> Please commit your changes or stash them before you can switch
branches."
>>>
>>> This is from a freshly cloned repo.
>>>
>>> I don't know if the issue is mine (can't see how), or a corrupt
git repo, or something to do with the soa-bpel file.
>>>
>>> -Eric
>>>
>>> _______________________________________________
>>> cross-project-issues-dev mailing list
>>> cross-project-issues-dev@xxxxxxxxxxx
>>> https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
>>>
>> _______________________________________________
>> cross-project-issues-dev mailing list
>> cross-project-issues-dev@xxxxxxxxxxx
>> https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
>>
>> _______________________________________________
>> cross-project-issues-dev mailing list
>> cross-project-issues-dev@xxxxxxxxxxx
>> https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
>>
>>
>> -----
>> No virus found in this message.
>> Checked by AVG - www.avg.com
>> Version: 2013.0.2890 / Virus Database: 2639/6039 - Release Date:
01/17/13
>>
>>
>>
>
> _______________________________________________
> cross-project-issues-dev mailing list
> cross-project-issues-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
_______________________________________________
cross-project-issues-dev mailing list
cross-project-issues-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
_______________________________________________ cross-project-issues-dev mailing list cross-project-issues-dev@xxxxxxxxxxx https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
|