You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@reef.apache.org by Tae-Geon Um <ta...@gmail.com> on 2015/08/19 04:25:21 UTC
Merge conflicts in lang/cs/ on ubuntu Jenkins
Hi all,
Previous ubuntu jenkins failed due to “FATAL: Could not checkout master with start point origin/master” error.
Geoffrey Corey (Infra team) said that it looks like tainted workspace, so suggested adding the advanced option to the git plugin to have it wipe out the workspace before building. (https://issues.apache.org/jira/browse/INFRA-10124 <https://issues.apache.org/jira/browse/INFRA-10124>)
After adding the option, ubuntu Jenkins fails due to the merge conflicts. (https://builds.apache.org/job/Reef-pull-request-ubuntu/336/console <https://builds.apache.org/job/Reef-pull-request-ubuntu/336/console>)
I’ve been taking a look at why the conflicts occur but I’m not sure right now.
Geoffrey Corey also said that it would be because of the files committed using Windows line endings and not UNIX line endings.
Any thoughts on this?
Thanks,
Taegeon
Re: Merge conflicts in lang/cs/ on ubuntu Jenkins
Posted by Tae-Geon Um <ta...@gmail.com>.
Thanks Markus!
Yes, it looks like it has been resolved by itself :)
I will keep your hunches and take a look at if the problem occurs again.
Thanks,
Taegeon
> On Aug 21, 2015, at 8:11 AM, Markus Weimer <ma...@weimo.de> wrote:
>
> The builds pass again. Has this issue been resolved?
>
> Markus
>
> On 2015-08-19 09:11, Markus Weimer wrote:
>> Hi,
>>
>> does checking out the code on a Linux box work?
>>
>> A hunch: One main difference between Linux and MacOS / Windows is that
>> the latter use file systems which are case-preserving, but case
>> insensitive. Hence. `reef`, `Reef`, `REEF` can all exist in the same
>> folder in Linux, but not MacOS or Windows. If we have, by accident,
>> renamed things purely by changing casing, this can throw off Linux
>> servers when replaying that change log.
>>
>> Another hunch: Maybe our recent changes to the treatment of line endings
>> throw off this particular version of git. From the logs, it looks like
>> jenkins uses a Java implementation of git? Maybe that doesn't support
>> the rewriting we do using .gitattributes?
>>
>> Markus
>>
>>
>> On 2015-08-18 19:25, Tae-Geon Um wrote:
>>> Hi all,
>>>
>>> Previous ubuntu jenkins failed due to “FATAL: Could not checkout master with start point origin/master” error.
>>> Geoffrey Corey (Infra team) said that it looks like tainted workspace, so suggested adding the advanced option to the git plugin to have it wipe out the workspace before building. (https://issues.apache.org/jira/browse/INFRA-10124 <https://issues.apache.org/jira/browse/INFRA-10124>)
>>>
>>> After adding the option, ubuntu Jenkins fails due to the merge conflicts. (https://builds.apache.org/job/Reef-pull-request-ubuntu/336/console <https://builds.apache.org/job/Reef-pull-request-ubuntu/336/console>)
>>> I’ve been taking a look at why the conflicts occur but I’m not sure right now.
>>>
>>> Geoffrey Corey also said that it would be because of the files committed using Windows line endings and not UNIX line endings.
>>> Any thoughts on this?
>>>
>>> Thanks,
>>> Taegeon
>>>
>>>
>>>
Re: Merge conflicts in lang/cs/ on ubuntu Jenkins
Posted by Markus Weimer <ma...@weimo.de>.
The builds pass again. Has this issue been resolved?
Markus
On 2015-08-19 09:11, Markus Weimer wrote:
> Hi,
>
> does checking out the code on a Linux box work?
>
> A hunch: One main difference between Linux and MacOS / Windows is that
> the latter use file systems which are case-preserving, but case
> insensitive. Hence. `reef`, `Reef`, `REEF` can all exist in the same
> folder in Linux, but not MacOS or Windows. If we have, by accident,
> renamed things purely by changing casing, this can throw off Linux
> servers when replaying that change log.
>
> Another hunch: Maybe our recent changes to the treatment of line endings
> throw off this particular version of git. From the logs, it looks like
> jenkins uses a Java implementation of git? Maybe that doesn't support
> the rewriting we do using .gitattributes?
>
> Markus
>
>
> On 2015-08-18 19:25, Tae-Geon Um wrote:
>> Hi all,
>>
>> Previous ubuntu jenkins failed due to “FATAL: Could not checkout master with start point origin/master” error.
>> Geoffrey Corey (Infra team) said that it looks like tainted workspace, so suggested adding the advanced option to the git plugin to have it wipe out the workspace before building. (https://issues.apache.org/jira/browse/INFRA-10124 <https://issues.apache.org/jira/browse/INFRA-10124>)
>>
>> After adding the option, ubuntu Jenkins fails due to the merge conflicts. (https://builds.apache.org/job/Reef-pull-request-ubuntu/336/console <https://builds.apache.org/job/Reef-pull-request-ubuntu/336/console>)
>> I’ve been taking a look at why the conflicts occur but I’m not sure right now.
>>
>> Geoffrey Corey also said that it would be because of the files committed using Windows line endings and not UNIX line endings.
>> Any thoughts on this?
>>
>> Thanks,
>> Taegeon
>>
>>
>>
Re: Merge conflicts in lang/cs/ on ubuntu Jenkins
Posted by Markus Weimer <ma...@weimo.de>.
Hi,
does checking out the code on a Linux box work?
A hunch: One main difference between Linux and MacOS / Windows is that
the latter use file systems which are case-preserving, but case
insensitive. Hence. `reef`, `Reef`, `REEF` can all exist in the same
folder in Linux, but not MacOS or Windows. If we have, by accident,
renamed things purely by changing casing, this can throw off Linux
servers when replaying that change log.
Another hunch: Maybe our recent changes to the treatment of line endings
throw off this particular version of git. From the logs, it looks like
jenkins uses a Java implementation of git? Maybe that doesn't support
the rewriting we do using .gitattributes?
Markus
On 2015-08-18 19:25, Tae-Geon Um wrote:
> Hi all,
>
> Previous ubuntu jenkins failed due to “FATAL: Could not checkout master with start point origin/master” error.
> Geoffrey Corey (Infra team) said that it looks like tainted workspace, so suggested adding the advanced option to the git plugin to have it wipe out the workspace before building. (https://issues.apache.org/jira/browse/INFRA-10124 <https://issues.apache.org/jira/browse/INFRA-10124>)
>
> After adding the option, ubuntu Jenkins fails due to the merge conflicts. (https://builds.apache.org/job/Reef-pull-request-ubuntu/336/console <https://builds.apache.org/job/Reef-pull-request-ubuntu/336/console>)
> I’ve been taking a look at why the conflicts occur but I’m not sure right now.
>
> Geoffrey Corey also said that it would be because of the files committed using Windows line endings and not UNIX line endings.
> Any thoughts on this?
>
> Thanks,
> Taegeon
>
>
>