From: Stefan Monnier <monnier@IRO.UMontreal.CA>
To: emacs-devel@gnu.org
Subject: Re: Merging emacs-25 into master
Date: Wed, 30 Dec 2015 23:54:30 -0500 [thread overview]
Message-ID: <jwvtwmzb4p3.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <m24mf2tjvg.fsf@newartisans.com> (John Wiegley's message of "Mon, 28 Dec 2015 12:10:11 -0800")
>> 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
prev parent reply other threads:[~2015-12-31 4:54 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvtwmzb4p3.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).