[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: EWW bugs should be fixed on emacs-25 branch
From: |
David Engster |
Subject: |
Re: EWW bugs should be fixed on emacs-25 branch |
Date: |
Sat, 26 Dec 2015 00:18:48 +0100 |
User-agent: |
Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.5 (gnu/linux) |
John Wiegley writes:
>>>>>> Eli Zaretskii <address@hidden> writes:
>
>> How about taking a look at the code (it's only 500-odd lines)? Maybe also
>> try it -- e.g., merge emacs-25 with master in your sandbox, just to see how
>> it feels. I think that will provide a much better answer than I could ever
>> hope to give.
>
> I did read it, but I will have to give it a try.
gitmerge.el will detect cherry-picks through the cherry-mark. However,
since git is the C++ of version control, this works only 99% of the
time. It does not work when the cherry-pick could not be applied
cleanly, since then the patch-id changes. It also does not work when the
same commit is also merged later (see the beginning of the emacs-25
branch for an example, where first a bunch of commits was cherry-picked
and later 'master' was also merged).
-David
- Re: EWW bugs should be fixed on emacs-25 branch, (continued)
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, Eli Zaretskii, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch, John Wiegley, 2015/12/25
- Re: EWW bugs should be fixed on emacs-25 branch,
David Engster <=
- Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch), John Wiegley, 2015/12/25
- Re: Having a custom merge process, Lars Ingebrigtsen, 2015/12/25
- Re: Having a custom merge process, David Engster, 2015/12/25
- Re: Having a custom merge process, John Wiegley, 2015/12/25
- Re: Having a custom merge process, Paul Eggert, 2015/12/26
- Re: Having a custom merge process, Eli Zaretskii, 2015/12/26
- Re: Having a custom merge process (was: EWW bugs should be fixed on emacs-25 branch), Eli Zaretskii, 2015/12/26
- EWW To Elpa? Re: Having a custom merge process, raman, 2015/12/26
- Re: EWW To Elpa? Re: Having a custom merge process, Lars Ingebrigtsen, 2015/12/26
- Re: EWW To Elpa? Re: Having a custom merge process, Artur Malabarba, 2015/12/26