From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: ludo@gnu.org (Ludovic =?utf-8?Q?Court=C3=A8s?=) Newsgroups: gmane.lisp.guile.devel Subject: Re: Merging stable-2.0 into master Date: Sat, 03 Nov 2012 15:10:11 +0100 Message-ID: <87wqy2kcak.fsf@gnu.org> References: <87625rogng.fsf@tines.lan> <87y5inmhcr.fsf@tines.lan> <87vcdnmze8.fsf@gnu.org> <87a9uzi1vn.fsf@tines.lan> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1351951829 4406 80.91.229.3 (3 Nov 2012 14:10:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 3 Nov 2012 14:10:29 +0000 (UTC) Cc: guile-devel@gnu.org To: Mark H Weaver Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Sat Nov 03 15:10:38 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 1TUeQn-0001oe-BA for guile-devel@m.gmane.org; Sat, 03 Nov 2012 15:10:37 +0100 Original-Received: from localhost ([::1]:51634 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUeQe-0004J7-AL for guile-devel@m.gmane.org; Sat, 03 Nov 2012 10:10:28 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:38860) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUeQa-0004Ip-Um for guile-devel@gnu.org; Sat, 03 Nov 2012 10:10:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUeQZ-0000qK-Ia for guile-devel@gnu.org; Sat, 03 Nov 2012 10:10:24 -0400 Original-Received: from xanadu.aquilenet.fr ([88.191.123.111]:49457) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUeQZ-0000ov-Cg for guile-devel@gnu.org; Sat, 03 Nov 2012 10:10:23 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by xanadu.aquilenet.fr (Postfix) with ESMTP id A9F667586; Sat, 3 Nov 2012 15:10:12 +0100 (CET) Original-Received: from xanadu.aquilenet.fr ([127.0.0.1]) by localhost (xanadu.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qdKZ+Cyxuh5U; Sat, 3 Nov 2012 15:10:12 +0100 (CET) Original-Received: from pluto (reverse-83.fdn.fr [80.67.176.83]) by xanadu.aquilenet.fr (Postfix) with ESMTPSA id 2CF79ECA; Sat, 3 Nov 2012 15:10:12 +0100 (CET) X-URL: http://www.fdn.fr/~lcourtes/ X-Revolutionary-Date: 13 Brumaire an 221 de la =?utf-8?Q?R=C3=A9volution?= X-PGP-Key-ID: 0xEA52ECF4 X-PGP-Key: http://www.fdn.fr/~lcourtes/ludovic.asc X-PGP-Fingerprint: 83C4 F8E5 10A3 3B4C 5BEA D15D 77DD 95E2 EA52 ECF4 X-OS: x86_64-unknown-linux-gnu In-Reply-To: <87a9uzi1vn.fsf@tines.lan> (Mark H. Weaver's message of "Sat, 03 Nov 2012 03:25:48 -0400") User-Agent: Gnus/5.130005 (Ma Gnus v0.5) Emacs/24.2 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 88.191.123.111 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:15076 Archived-At: Hi Mark, Mark H Weaver skribis: > ludo@gnu.org (Ludovic Court=C3=A8s) writes: >> Mark H Weaver skribis: >> >>> I went ahead and pushed a proper merge of stable-2.0 into master. >> >> Great, thanks! Which method did you use? > > I used the more elaborate method described in my earlier email, so the > git history looks like the merges that wingo has been doing. In other > words, I pushed only one new commit to the master branch, namely the one > produced by "git merge origin/stable-2.0". However, to resolve the > merge conflicts I simply copied the files from the end result of my > earlier one-commit-at-a-time approach. Wow, great. Thanks for taking the time! > I saved a copy of the stable-2.0 patches adapted to master (as output by > "git format-patch") which produce precisely the same result as my merge > commit. If you like, I can make them available. Hopefully we won=E2=80=99t need them. It=E2=80=99s quite green at so presumably things went well. Ludo=E2=80=99.