|
From: | Paul Eggert |
Subject: | Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets |
Date: | Sun, 01 Feb 2015 11:53:34 -0800 |
User-agent: | Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 |
Dmitry Gutov wrote:
On 02/01/2015 06:17 PM, address@hidden 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).
[Prev in Thread] | Current Thread | [Next in Thread] |