From mboxrd@z Thu Jan  1 00:00:00 1970
From: Federico Beffa <beffa@ieee.org>
Subject: Re: wip-gobject-introspection
Date: Sun, 18 Jan 2015 18:26:51 +0100
Message-ID: <CAKrPhPPP_c39N5YP-DpZkOS5_3sCNfnWWDkjbhR_0zXOfSgnpA@mail.gmail.com>
References: <CAKrPhPOmcWvFTxUyfg=Raq_=Ng0SK1==TCYxqqOEnVH+Bek=uQ@mail.gmail.com>
	<87mw5l3x39.fsf@gnu.org>
	<CAKrPhPO7MYTOqU1tZjr4BOtybOGCJ02rgqViBXJpOYwEiE8FQQ@mail.gmail.com>
	<87egqtjosx.fsf@netris.org>
	<CAKrPhPP559a=aPRxT3Vd5+UBWJ7KFX2qZm4NVhqa5=5q2OYSMw@mail.gmail.com>
	<87a91hjdeb.fsf@netris.org>
	<CAKrPhPOc=sERTTaG_-uQzZKuaX4vPn5PE6amX=Y9Ycjsxt0Qvg@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41996)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <federico.beffa@gmail.com>) id 1YCtcj-0003b8-R1
	for guix-devel@gnu.org; Sun, 18 Jan 2015 12:26:54 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <federico.beffa@gmail.com>) id 1YCtci-00075r-PH
	for guix-devel@gnu.org; Sun, 18 Jan 2015 12:26:53 -0500
Received: from mail-la0-x22e.google.com ([2a00:1450:4010:c03::22e]:47121)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <federico.beffa@gmail.com>) id 1YCtci-00075l-HR
	for guix-devel@gnu.org; Sun, 18 Jan 2015 12:26:52 -0500
Received: by mail-la0-f46.google.com with SMTP id s18so4627941lam.5
	for <guix-devel@gnu.org>; Sun, 18 Jan 2015 09:26:51 -0800 (PST)
In-Reply-To: <CAKrPhPOc=sERTTaG_-uQzZKuaX4vPn5PE6amX=Y9Ycjsxt0Qvg@mail.gmail.com>
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Mark H Weaver <mhw@netris.org>
Cc: Guix-devel <guix-devel@gnu.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