From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 11:53:34 -0800 Organization: UCLA Computer Science Department Message-ID: <54CE843E.1090701@cs.ucla.edu> References: <20150201003025.18138.95966@vcs.savannah.gnu.org> <54CDC38C.9080701@yandex.ru> <54CE05A0.2090701@cs.ucla.edu> <54CE4FB9.1060800@yandex.ru> <54CE54A6.1000606@yandex.ru> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1422820440 354 80.91.229.3 (1 Feb 2015 19:54:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 19:54:00 +0000 (UTC) Cc: emacs-devel@gnu.org To: joakim@verona.se Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 20:54:00 2015 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 1YI0ag-0003jr-FQ for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 20:53:54 +0100 Original-Received: from localhost ([::1]:51731 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0af-0000GS-Pp for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 14:53:53 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:55254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0aT-0000GM-6y for emacs-devel@gnu.org; Sun, 01 Feb 2015 14:53:42 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YI0aO-0002BT-8K for emacs-devel@gnu.org; Sun, 01 Feb 2015 14:53:41 -0500 Original-Received: from smtp.cs.ucla.edu ([131.179.128.62]:46755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0aO-0002BK-3D for emacs-devel@gnu.org; Sun, 01 Feb 2015 14:53:36 -0500 Original-Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp.cs.ucla.edu (Postfix) with ESMTP id 4CE83A60052; Sun, 1 Feb 2015 11:53:35 -0800 (PST) X-Virus-Scanned: amavisd-new at smtp.cs.ucla.edu Original-Received: from smtp.cs.ucla.edu ([127.0.0.1]) by localhost (smtp.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 0yz26yxYMGul; Sun, 1 Feb 2015 11:53:34 -0800 (PST) Original-Received: from [192.168.1.9] (pool-173-55-11-52.lsanca.fios.verizon.net [173.55.11.52]) by smtp.cs.ucla.edu (Postfix) with ESMTPSA id CD686A60051; Sun, 1 Feb 2015 11:53:34 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 In-Reply-To: <54CE54A6.1000606@yandex.ru> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 131.179.128.62 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:182208 Archived-At: Dmitry Gutov wrote: > On 02/01/2015 06:17 PM, joakim@verona.se wrote: >> But wouldnt the xwidget branch still be in master then? > > Note the "check out the last master before the merge" step. That would be commit > a2c32b0. I did that just now in commit 241260cc2819e5df254ad85953588b06388ade61, which reverts all the xwidget-related changes since that commit. This should let people install independent patches without worrying about the xwidgets merge for now. Another option would be to rewrite the master history; I've never been comfortable with that, but please feel free to do it that way if you prefer (and please don't forget to keep the non-xwidget-related changes since that commit, currently limited to lisp/ldefs-boot.el).