emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets


From: joakim
Subject: Re: [Emacs-diffs] xwidget 9fe732a 2/2: Better changelog for xwidgets
Date: Sun, 01 Feb 2015 20:59:55 +0100
User-agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux)

Paul Eggert <address@hidden> writes:

> 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).
>

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]