Re: wip-gobject-introspection

[Federico Beffa <beffa@ieee.org>]

On Sun, Jan 18, 2015 at 10:44 AM, Federico Beffa <beffa@ieee.org> wrote:
>>> On Sat, Jan 17, 2015 at 6:32 PM, Mark H Weaver <mhw@netris.org> wrote:
>>>> At this point, it would be good to rebase (not merge) the
>>>> 'wip-gobject-introspection' branch on current master.  Presently, the
>>>> branch is based on master before core-updates was merged, which means a
>>>> considerably different core system than what we currently have.

[...]

>>> If I understand correctly this is the command I would issue from the
>>> wip-gobject-introspection branch:
>>>
>>> git rebase master
>>
>> Yes.  It will need help rebasing your 'eudev' commits.  As with 'git
>> merge', it will insert merge conflict markers which you must fix up
>> yourself.  Then 'git add <files>' and 'git rebase --continue'.
>>
>> Then, after some testing, it would be good to push it to savannah.
>> Because of the rebase, you'll have to delete the branch on savannah and
>> then remake it, as follows:
>>
>>   git push origin :wip-gobject-introspection  # delete it on savannah
>>   git push origin wip-gobject-introspection   # push the new one
>>

I've rebased the branch, checked that eudev builds fine after
adjusting it and re-created the branch on savannah.

Regards,
Fede