[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/ema

From: Paul Eggert
Subject: Re: master 7f4f16b: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Tue, 27 Jan 2015 22:37:44 -0800
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0

Lars Ingebrigtsen wrote:
I hope that didn't ... destroy anything.

This is git, so nothing is ever destroyed, it's just ... mutated.

I repaired the problems I found in master commit 39c2fa3f4e5bf332cc30266d36d5410c4ffeaac4. Your commit merged from emacs-24, which is generally a good thing to do, so I left that part alone.

I didn't fix the dates in the ChangeLogs; you can take a look at those. The convention is that the dates are supposed to be as of the merge, not as of the original checkin. Which reminds me, we need to get the ball rolling again on having ChangeLogs generated automatically, to avoid that part of the merge hassle in the future.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]