* Re: master 89ce83b: Merge from origin/emacs-25
[not found] ` <E1ayZ24-0002lD-PG@vcs.savannah.gnu.org>
@ 2016-05-06 15:58 ` Glenn Morris
2016-05-06 17:14 ` Dmitry Gutov
2016-05-07 0:31 ` test/automated subdir in master Paul Eggert
0 siblings, 2 replies; 3+ messages in thread
From: Glenn Morris @ 2016-05-06 15:58 UTC (permalink / raw)
To: emacs-devel
Please could somone fix the test/automated directory in master. Again.
This happens so often, it almost feels worth adding something to
gitmerge.el.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: master 89ce83b: Merge from origin/emacs-25
2016-05-06 15:58 ` master 89ce83b: Merge from origin/emacs-25 Glenn Morris
@ 2016-05-06 17:14 ` Dmitry Gutov
2016-05-07 0:31 ` test/automated subdir in master Paul Eggert
1 sibling, 0 replies; 3+ messages in thread
From: Dmitry Gutov @ 2016-05-06 17:14 UTC (permalink / raw)
To: Glenn Morris, emacs-devel
On 05/06/2016 06:58 PM, Glenn Morris wrote:
>
> Please could somone fix the test/automated directory in master. Again.
> This happens so often, it almost feels worth adding something to
> gitmerge.el.
I was going to do that later, but thanks to Paul for beating me to it.
This is probably the last new test file in Emacs 25, and after the
release development will branch off the next test structure.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: test/automated subdir in master
2016-05-06 15:58 ` master 89ce83b: Merge from origin/emacs-25 Glenn Morris
2016-05-06 17:14 ` Dmitry Gutov
@ 2016-05-07 0:31 ` Paul Eggert
1 sibling, 0 replies; 3+ messages in thread
From: Paul Eggert @ 2016-05-07 0:31 UTC (permalink / raw)
To: Glenn Morris, emacs-devel
On 05/06/2016 08:58 AM, Glenn Morris wrote:
> Please could somone fix the test/automated directory in master.
Should be fixed now.
> This happens so often, it almost feels worth adding something to
> gitmerge.el.
>
It might be, yes. Failing that I added a simple test to 'make check' in
master, to try to detect merge botches like that. If your master 'make
check' fails like this:
test ! -d ./automated
Makefile:156: recipe for target 'check-no-automated-subdir' failed
make[1]: *** [check-no-automated-subdir] Error 1
then a simple fix is (1) make sure test/automated doesn't contain
anything useful, and then (2) rm -fr test/automated.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-07 0:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20160506061436.10556.24626@vcs.savannah.gnu.org>
[not found] ` <E1ayZ24-0002lD-PG@vcs.savannah.gnu.org>
2016-05-06 15:58 ` master 89ce83b: Merge from origin/emacs-25 Glenn Morris
2016-05-06 17:14 ` Dmitry Gutov
2016-05-07 0:31 ` test/automated subdir in master Paul Eggert
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).