From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: joakim@verona.se Newsgroups: gmane.emacs.devel Subject: Re: Merging the xwidget branch Date: Sat, 09 Jan 2016 10:55:56 +0100 Message-ID: References: <83d1ud8gl0.fsf@gnu.org> <83oadx6jtl.fsf@gnu.org> <83k2ok7s4p.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1452333410 31182 80.91.229.3 (9 Jan 2016 09:56:50 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 9 Jan 2016 09:56:50 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Jan 09 10:56:32 2016 Return-path: Envelope-to: ged-emacs-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 1aHqG5-0000kR-CK for ged-emacs-devel@m.gmane.org; Sat, 09 Jan 2016 10:56:29 +0100 Original-Received: from localhost ([::1]:39937 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHqG4-0007yV-Ty for ged-emacs-devel@m.gmane.org; Sat, 09 Jan 2016 04:56:28 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:41722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHqG1-0007yP-U5 for emacs-devel@gnu.org; Sat, 09 Jan 2016 04:56:26 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aHqG1-0002HB-2L for emacs-devel@gnu.org; Sat, 09 Jan 2016 04:56:25 -0500 Original-Received: from mx2.bahnhof.se ([213.80.101.12]:41560) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aHqFx-0002FR-7s; Sat, 09 Jan 2016 04:56:21 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx2-reinject (Postfix) with ESMTP id 3D57A40AE0; Sat, 9 Jan 2016 10:56:20 +0100 (CET) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MF1) Original-Received: from mf1.bahnhof.se ([127.0.0.1]) by localhost (mf1.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qE34k9C+Qb0I; Sat, 9 Jan 2016 10:56:14 +0100 (CET) Original-Received: from mta.verona.se (h-235-62.a149.priv.bahnhof.se [85.24.235.62]) by mf1.bahnhof.se (Postfix) with ESMTP id AF33C330AD6; Sat, 9 Jan 2016 10:56:12 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id 8218C4E804A; Sat, 9 Jan 2016 09:56:12 +0000 (UTC) X-Virus-Scanned: amavisd-new at verona.se Original-Received: from mta.verona.se ([127.0.0.1]) by localhost (exodia.verona.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZQPHATTgJuda; Sat, 9 Jan 2016 10:55:57 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id 216534E8047; Sat, 9 Jan 2016 10:55:57 +0100 (CET) In-Reply-To: <83k2ok7s4p.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 11 Dec 2015 20:32:54 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 213.80.101.12 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:197897 Archived-At: Eli Zaretskii writes: >> From: joakim@verona.se >> Cc: emacs-devel@gnu.org >> Date: Fri, 11 Dec 2015 17:33:49 +0100 >> >> >> - I would like some hand-holding during commiting of the patch, better >> >> yet if some trusted party could do it for me with hand holding from me >> >> instead >> > >> > What exactly are the problems you envision? >> >> Well, none, except I didn't succeed very well last time. > > If you do it on your machine first and have no problems compiling > after that, both with and without xwidget support, then the result > cannot be too wrong, I think. > >> >> - Some unforseen events have made me have less time than usual at the >> >> moment. >> > >> > Will you be able to look into any problems that might come up after >> > the merge? >> >> Yes, I will have more time after the 17th. > > Then lets wait until then, and merge. Just to make sure: - xwidget_mvp is the branch we are talking about. I updated it recently from master - There are maybe some spurious diffs in there somewhere. I can have a look. - I'm not sure which branch we are going to merge this to, I'll leave that to Eli > >> Anyway, I'm not envisioning a merge as such, since the history isn't needed. > > It's up to you. > > Thanks. -- Joakim Verona