From: John Wiegley <jwiegley@gmail.com>
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: emacs-devel@gnu.org
Subject: Re: Merging emacs-25 into master
Date: Mon, 28 Dec 2015 12:10:11 -0800 [thread overview]
Message-ID: <m24mf2tjvg.fsf@newartisans.com> (raw)
In-Reply-To: <jwvy4chltm9.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Fri, 25 Dec 2015 23:35:14 -0500")
[-- 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 --]
next prev parent reply other threads:[~2015-12-28 20:10 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 [this message]
2015-12-29 1:32 ` Paul Eggert
2015-12-31 4:54 ` Stefan Monnier
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=m24mf2tjvg.fsf@newartisans.com \
--to=jwiegley@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/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).