From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: nalaginrut Newsgroups: gmane.lisp.guile.devel Subject: Re: Merging stable-2.0 into master Date: Wed, 31 Oct 2012 10:06:46 +0800 Organization: HFG Message-ID: <1351649206.2208.34.camel@Renee-desktop.suse> References: <87625rogng.fsf@tines.lan> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1351649217 24320 80.91.229.3 (31 Oct 2012 02:06:57 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 31 Oct 2012 02:06:57 +0000 (UTC) Cc: guile-devel@gnu.org To: Mark H Weaver Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Wed Oct 31 03:07:06 2012 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TTNhx-0004Q7-9y for guile-devel@m.gmane.org; Wed, 31 Oct 2012 03:07:05 +0100 Original-Received: from localhost ([::1]:46209 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTNho-0008UE-Sh for guile-devel@m.gmane.org; Tue, 30 Oct 2012 22:06:56 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45096) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTNhl-0008TU-RK for guile-devel@gnu.org; Tue, 30 Oct 2012 22:06:54 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TTNhk-00070O-Ox for guile-devel@gnu.org; Tue, 30 Oct 2012 22:06:53 -0400 Original-Received: from mail-ie0-f169.google.com ([209.85.223.169]:45984) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TTNhk-00070I-Js for guile-devel@gnu.org; Tue, 30 Oct 2012 22:06:52 -0400 Original-Received: by mail-ie0-f169.google.com with SMTP id 10so1715478ied.0 for ; Tue, 30 Oct 2012 19:06:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:subject:from:to:cc:date:in-reply-to:references :organization:content-type:x-mailer:mime-version :content-transfer-encoding; bh=V1U8VJHTgvmIobWvZfnNbM9eXxUKOy3wflkiPUueXoE=; b=xiu5QCr9V/Xj0HL25AHxWs0YRLYrrVlsDriOoJ2qExzfzxtXLevbIFWOV1M5gABRlM a2NtQZ56G2nq07oV6TiOtwvR9QbOiZzf2Ba51pC/hqpL7pVjx3K+LwPCKhy2lRfPms2L cnkt2ZF8HwzGeTDLMZO6mgEnS8GLWv1NbTXkMsW+wft8w6A/vIUPeo79HZL45oPYAaSM AuvGColBsSKJWqakTXmIf430ToOhIXg8bfbuRBjkyJrzy/oZL3+wKOBoi8hMWc/g2uI2 Sy0rcGqwOof0wKef9wqwpqXtM6U3KeSY9sfXpqYMvCKNlB3+oRfmOX9p5ITwLGINVMTg Gbog== Original-Received: by 10.50.47.165 with SMTP id e5mr29648ign.57.1351649211639; Tue, 30 Oct 2012 19:06:51 -0700 (PDT) Original-Received: from [147.2.147.112] ([61.14.130.226]) by mx.google.com with ESMTPS id o9sm9498830igd.7.2012.10.30.19.06.49 (version=SSLv3 cipher=OTHER); Tue, 30 Oct 2012 19:06:50 -0700 (PDT) In-Reply-To: <87625rogng.fsf@tines.lan> X-Mailer: Evolution 3.4.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.223.169 X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:15067 Archived-At: For cautious, anyone tried if 'master' could be compiled/run successfully? On Tue, 2012-10-30 at 16:21 -0400, Mark H Weaver wrote: > Hello all, > > I've started the process of merging stable-2.0 into master. It's an > unusually large merge (50 commits, since July 28), and I found 'git > merge' too overwhelming to deal with in one piece, so for now I've been > applying one commit at a time, adapting them as needed with frequent > runs of 'make check'. So far I've worked through 31 out of 50. > > My question is: after I've finished adapting and applying all of the > commits, is it okay to simply push them to master? Or is it worthwhile > to instead do the following? > > 1. Save a copy of the files that changed from adapting and applying > all of the commits from stable-2.0. > 2. git reset --hard origin/master > 3. git merge origin/stable-2.0 > (making sure that nothing new has been pushed to stable-2.0) > 4. Compare the auto-merged files with the copies from step 1. > 5. Use the copies from step 1 to resolve merge conflicts. > 6. Commit the merge > > I guess it's a question of how we want the commit history to look, > and how it will affect future merges. > > What do you think? > > Mark >