Another factor, sometimes the b3 aggregator editor will change a file,
that you did not purposely edit. Especially if you edit "simrel.b3aggr".
This too is expected behavior, because under some conditions the
aggregator (or, EMF) must "save the model" ... and "the model" is
represented by all the files combined. Usually these are just changes in
formatting. Such as comments or whitespace is removed, sometimes the order
of attributes changed ... standard XML serialization stuff. I try to
"check in" changes when I see a "format only" change, but its
understandable that if someone is not comfortable with that to simply
"throw away" those changes you yourself did not make.
HTH
From: Ed Willink <e...@willink.me.uk>
To: Cross project issues <cross-project-issues-dev@eclipse.org>,
Date: 01/18/2013 04:55 PM
Subject: Re: [cross-project-issues-dev] Corrupt Simrel repo???
Sent by: cross-project-issues-dev-boun...@eclipse.org
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.g...@oracle.com> 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@eclipse.org
>> https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
>>
> _______________________________________________
> cross-project-issues-dev mailing list
> cross-project-issues-dev@eclipse.org
> https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
>
> _______________________________________________
> cross-project-issues-dev mailing list
> cross-project-issues-dev@eclipse.org
> 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@eclipse.org
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
_______________________________________________
cross-project-issues-dev mailing list
cross-project-issues-dev@eclipse.org
https://dev.eclipse.org/mailman/listinfo/cross-project-issues-dev
