* Re: master f95bbe5 3/6: -
[not found] ` <E1aiQnt-0004qe-FN@vcs.savannah.gnu.org>
@ 2016-03-22 19:31 ` Michael Albinus
2016-03-22 20:03 ` Paul Eggert
0 siblings, 1 reply; 2+ messages in thread
From: Michael Albinus @ 2016-03-22 19:31 UTC (permalink / raw
To: emacs-devel; +Cc: Paul Eggert
Paul Eggert <eggert@cs.ucla.edu> writes:
> branch: master
> commit f95bbe5a67e03fe6d05cbfb4d0c9151a754d6ccd
> Merge: 4869e0d b8ea08b
> Author: Paul Eggert <eggert@cs.ucla.edu>
> Commit: Paul Eggert <eggert@cs.ucla.edu>
>
> -
> ---
> admin/release-process | 4 ++--
> doc/emacs/abbrevs.texi | 9 +++++----
> doc/lispref/abbrevs.texi | 9 ++++++---
> doc/misc/eshell.texi | 4 +++-
> etc/themes/tsdh-light-theme.el | 7 ++++---
> lisp/doc-view.el | 2 +-
> lisp/forms.el | 2 +-
> lisp/mail/rmail.el | 2 ++
> lisp/progmodes/cc-defs.el | 2 +-
> lisp/progmodes/ruby-mode.el | 4 ++--
> lisp/progmodes/xref.el | 11 +++++------
> lisp/simple.el | 36 +++++++++++++++++++++---------------
> src/bidi.c | 2 +-
> src/emacsgtkfixed.c | 3 +--
> src/emacsgtkfixed.h | 1 -
> src/floatfns.c | 3 +--
> src/gtkutil.c | 12 ++++--------
> src/lisp.h | 3 ++-
> src/nsterm.m | 30 +++++++++++++++++++++++++++++-
> test/lisp/net/tramp-tests.el | 13 +++++++++++--
> 20 files changed, 102 insertions(+), 57 deletions(-)
Hmm. In the commit message of tramp-tests.el in the emacs-25 branch, I wrote
Suppress some Tramp tests for OSX, do not merge with master
Now it has arrived master. And also no commit message in master, that
means ChangeLog generation won't work.
Merges are going worse :-(
Best regards, Michael.
PS: I'll revert that change in master.
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: master f95bbe5 3/6: -
2016-03-22 19:31 ` master f95bbe5 3/6: - Michael Albinus
@ 2016-03-22 20:03 ` Paul Eggert
0 siblings, 0 replies; 2+ messages in thread
From: Paul Eggert @ 2016-03-22 20:03 UTC (permalink / raw
To: Michael Albinus, emacs-devel
On 03/22/2016 12:31 PM, Michael Albinus wrote:
> Hmm. In the commit message of tramp-tests.el in the emacs-25 branch, I wrote
>
> Suppress some Tramp tests for OSX, do not merge with master
>
> Now it has arrived master.
Thanks for noticing that. I see you fixed that particular commit
already. I just now changed gitmerge.el so that this problem shouldn't
recur.
> And also no commit message in master, that
> means ChangeLog generation won't work.
When installing reverts like this, it's helpful to have a commit message
that contains details about it, e.g., something like the following. That
will make it easier for others to figure out later what happened.
-----
Keep some Tramp tests for OS X
This reverts commit dca240a70dcb1456a079a4738ac8e04c6698fc78,
which was mistakenly merged from emacs-25 earlier today.
* test/automated/tramp-tests.el (tramp--test-darwin-p): Remove.
All uses removed. (Bug#22145)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-03-22 20:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160322181316.18561.2201@vcs.savannah.gnu.org>
[not found] ` <E1aiQnt-0004qe-FN@vcs.savannah.gnu.org>
2016-03-22 19:31 ` master f95bbe5 3/6: - Michael Albinus
2016-03-22 20:03 ` Paul Eggert
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.