Merging emacs-25 into master

Merging emacs-25 into master

[Stefan Monnier]

I just tried to merge from emacs-25 to master, via gitmerge.el.
Just to let you know that this sucked, and after fixing a few obvious
problems by hand and finally bumping into assertion errors, I simply
gave up in disgust.

It's not healthy to wait that long before performing such merges.

Good luck, tho,


        Stefan

Re: Merging emacs-25 into master

[John Wiegley]

[-- Attachment #1: Type: text/plain, Size: 688 bytes --]

>>>>> Stefan Monnier <monnier@IRO.UMontreal.CA> writes:

> I just tried to merge from emacs-25 to master, via gitmerge.el. Just to let
> you know that this sucked, and after fixing a few obvious problems by hand
> and finally bumping into assertion errors, I simply gave up in disgust.

Thanks for the attempt, Stefan. Any notes you can send me for when I pick up
the baton?

These merges should happen no less often than weekly, so I'm going to do my
first one tomorrow, and then establish a regular schedule after that.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 629 bytes --]

Re: Merging emacs-25 into master

[Paul Eggert]

John Wiegley wrote:
> These merges should happen no less often than weekly, so I'm going to do my
> first one tomorrow

I was planning to do a merge in the next day or two, but if you prefer to do it 
please go ahead. Although the main problem is the ChangeLog business, there are 
others.

Re: Merging emacs-25 into master

[Stefan Monnier]

>> I just tried to merge from emacs-25 to master, via gitmerge.el.  Just to let
>> you know that this sucked, and after fixing a few obvious problems by hand
>> and finally bumping into assertion errors, I simply gave up in disgust.
> Thanks for the attempt, Stefan.  Any notes you can send me for when I pick up
> the baton?

Sorry, nothing very specific.  I remember a minor issue in the undo
code, but there were more worrying problems elsewhere that
I can't remember.

> These merges should happen no less often than weekly, so I'm going to do my
> first one tomorrow, and then establish a regular schedule after that.

Weekly sounds good.  It can even be slightly longer, but after a while
it gets more difficult to let the author of the problematic code deal
with the conflicts (which is usually the simplest option).


        Stefan