Review Request 109503: Compile with current qt dev branch

[Ben Cooksley]

On Sun, Mar 17, 2013 at 12:29 AM, Stephen Kelly <steveire at gmail.com> wrote:
> Ben Cooksley wrote:
>
>> On Sun, Mar 17, 2013 at 12:23 AM, Stephen Kelly <steveire at gmail.com>
>> wrote:
>>> Stephen Kelly wrote:
>>>
>>>> Ben Cooksley wrote:
>>>>> In theory, however Jenkins itself does Git handling for part of the
>>>>> process and that may very well override our invocation of that.
>>>>>
>>>>> In any case, git spits out the following if I run that for each
>>>>> submodule:
>>>>>
>>>>> You are not currently on a branch, so I cannot use any
>>>>> 'branch.<branchname>.merge' in your configuration file.
>>>>> Please specify which branch you want to merge with on the command
>>>>> line and try again (e.g. 'git pull <repository> <refspec>').
>>>>> See git-pull(1) for details.
>>>>>
>>>>> So we would need something more advanced than that.
>>>>>
>>>>
>>>> Try
>>>>
>>>>  git submodule foreach 'git fetch; git reset --hard origin/dev
>>>
>>> I mean
>>>
>>>   git submodule foreach 'git fetch; git reset --hard origin/dev || true'
>>
>> That works for the most part, except with qtqa, qtrepotools and
>> qtx11extras which don't have a 'dev' branch for some unknown reason.
>> As qtx11extras is a recent addition which we have needed, I suspect
>> this could cause issues.
>
> Yes, could those be special-cased?
>
>  git submodule foreach 'git fetch; git reset --hard origin/dev || true'
>  cd qtx11extras && git fetch && git reset --hard origin/master

I tried the command invocation:
git submodule foreach 'git fetch; git reset --hard origin/dev || git
reset --hard origin/master || true'

Which does do the job. However, as feared Jenkins is far too clever
and overwrites that completely, checking out the directories specified
in the .gitmodules file.

This means we need to construct a completely synthetic .gitmodules
file (which will then cause Jenkins to do the work of ensuring the
right branches are checked out) I suspect. Anyone got any other ideas?

>
> etc?
>
> Thanks,
>
> Steve.

Regards,
Ben

>
> _______________________________________________
> Kde-frameworks-devel mailing list
> Kde-frameworks-devel at kde.org
> https://mail.kde.org/mailman/listinfo/kde-frameworks-devel