* Merging emacs-25 into master
@ 2015-12-26 4:35 Stefan Monnier
2015-12-28 20:10 ` John Wiegley
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Monnier @ 2015-12-26 4:35 UTC (permalink / raw)
To: emacs-devel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Merging emacs-25 into master
2015-12-26 4:35 Merging emacs-25 into master Stefan Monnier
@ 2015-12-28 20:10 ` John Wiegley
2015-12-29 1:32 ` Paul Eggert
2015-12-31 4:54 ` Stefan Monnier
0 siblings, 2 replies; 4+ messages in thread
From: John Wiegley @ 2015-12-28 20:10 UTC (permalink / raw)
To: Stefan Monnier; +Cc: emacs-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Merging emacs-25 into master
2015-12-28 20:10 ` John Wiegley
@ 2015-12-29 1:32 ` Paul Eggert
2015-12-31 4:54 ` Stefan Monnier
1 sibling, 0 replies; 4+ messages in thread
From: Paul Eggert @ 2015-12-29 1:32 UTC (permalink / raw)
To: emacs-devel
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: Merging emacs-25 into master
2015-12-28 20:10 ` John Wiegley
2015-12-29 1:32 ` Paul Eggert
@ 2015-12-31 4:54 ` Stefan Monnier
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Monnier @ 2015-12-31 4:54 UTC (permalink / raw)
To: emacs-devel
>> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2015-12-31 4:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-12-26 4:35 Merging emacs-25 into master Stefan Monnier
2015-12-28 20:10 ` John Wiegley
2015-12-29 1:32 ` Paul Eggert
2015-12-31 4:54 ` Stefan Monnier
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.