From mboxrd@z Thu Jan 1 00:00:00 1970 From: Federico Beffa Subject: Re: wip-gobject-introspection Date: Sun, 18 Jan 2015 10:44:32 +0100 Message-ID: References: <87mw5l3x39.fsf@gnu.org> <87egqtjosx.fsf@netris.org> <87a91hjdeb.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]:50757) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YCmPL-0002c2-5J for guix-devel@gnu.org; Sun, 18 Jan 2015 04:44:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YCmPK-0004Sr-0u for guix-devel@gnu.org; Sun, 18 Jan 2015 04:44:35 -0500 Received: from mail-la0-x232.google.com ([2a00:1450:4010:c03::232]:37920) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YCmPJ-0004Sg-OG for guix-devel@gnu.org; Sun, 18 Jan 2015 04:44:33 -0500 Received: by mail-la0-f50.google.com with SMTP id pn19so24617831lab.9 for ; Sun, 18 Jan 2015 01:44:32 -0800 (PST) In-Reply-To: <87a91hjdeb.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 10:38 PM, Mark H Weaver wrote: > Federico Beffa writes: > >> 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. > > You're right to be wary of rebasing public branches, but I think it's > okay with short-lived experimental branches like this. If it turns out > that someone else has done work on it, the situation is easily remedied. > >> 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 ' 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 > Thanks for the detailed instructions! Regards, Fede