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: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets Date: Sun, 01 Feb 2015 20:59:55 +0100 Message-ID: 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> <54CE843E.1090701@cs.ucla.edu> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1422820847 7053 80.91.229.3 (1 Feb 2015 20:00:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 1 Feb 2015 20:00:47 +0000 (UTC) Cc: emacs-devel@gnu.org To: Paul Eggert Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Feb 01 21:00:47 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 1YI0hK-0008J9-Oj for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 21:00:46 +0100 Original-Received: from localhost ([::1]:51754 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0hK-0003Qi-8S for ged-emacs-devel@m.gmane.org; Sun, 01 Feb 2015 15:00:46 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0h0-0003QR-LT for emacs-devel@gnu.org; Sun, 01 Feb 2015 15:00:27 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YI0gw-0005Pt-K3 for emacs-devel@gnu.org; Sun, 01 Feb 2015 15:00:26 -0500 Original-Received: from mx1.bahnhof.se ([213.80.101.11]:33671) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YI0gw-0005Pc-E2 for emacs-devel@gnu.org; Sun, 01 Feb 2015 15:00:22 -0500 Original-Received: from localhost (mf.bahnhof.se [213.80.101.20]) by mx1-reinject (Postfix) with ESMTP id C9C314099B; Sun, 1 Feb 2015 21:00:20 +0100 (CET) X-Virus-Scanned: by amavisd-new using ClamAV at bahnhof.se (MF2) Original-Received: from mf2.bahnhof.se ([127.0.0.1]) by localhost (mf2.bahnhof.se [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 77GqyXQ+4q2l; Sun, 1 Feb 2015 21:00:14 +0100 (CET) Original-Received: from mta.verona.se (h-235-62.a149.priv.bahnhof.se [85.24.235.62]) by mf2.bahnhof.se (Postfix) with ESMTP id F0BFA940220; Sun, 1 Feb 2015 21:00:13 +0100 (CET) Original-Received: from localhost (unknown [127.0.0.1]) by mta.verona.se (Postfix) with ESMTP id 6D43252B4C0; Sun, 1 Feb 2015 20:00:13 +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 S7iQAabyYYkq; Sun, 1 Feb 2015 20:59:56 +0100 (CET) Original-Received: from exodia.verona.se (www.verona.se [192.168.200.15]) by mta.verona.se (Postfix) with ESMTP id 0098852AF14; Sun, 1 Feb 2015 20:59:55 +0100 (CET) In-Reply-To: <54CE843E.1090701@cs.ucla.edu> (Paul Eggert's message of "Sun, 01 Feb 2015 11:53:34 -0800") User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.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.11 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:182210 Archived-At: Paul Eggert writes: > 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). > Thank you very much! Can I go back to my cave and fix the xwidget branch now? Also, how did you actually achieve the revert? -- Joakim Verona