From mboxrd@z Thu Jan 1 00:00:00 1970 From: Federico Beffa Subject: Re: wip-gobject-introspection Date: Sat, 17 Jan 2015 19:57:58 +0100 Message-ID: References: <87mw5l3x39.fsf@gnu.org> <87egqtjosx.fsf@netris.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:42543) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YCYZN-0001SW-U6 for guix-devel@gnu.org; Sat, 17 Jan 2015 13:58:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YCYZN-0005tN-0Y for guix-devel@gnu.org; Sat, 17 Jan 2015 13:58:01 -0500 In-Reply-To: <87egqtjosx.fsf@netris.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 Cc: Guix-devel On Sat, Jan 17, 2015 at 6:32 PM, Mark H Weaver 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. I would like to double check if I'm the only one having done any commits to wip-gobject-introspection branch (even local, not pushed ones. This is because the git manual warns people away from rebasing branches which have been made public and on which somebody else has done some work. So, I would like to make sure I don't mess up with anyone. If I understand correctly this is the command I would issue from the wip-gobject-introspection branch: git rebase master > > Note that since 'udev' was removed completely in core-updates, and now > 'eudev' is its own package that doesn't inherit from, your 'eudev' > commits will have to be manually adjusted. OK I've also noticed that xorg-server failed to pass a test on hydra. I'm surprised because on my x86_64 machine everything goes smooth. Maybe the rebase will help as I see that master has a newer xorg-server version. Regards, Fede