[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: test/automated subdir in master
|
From: |
Paul Eggert |
|
Subject: |
Re: test/automated subdir in master |
|
Date: |
Fri, 6 May 2016 17:31:08 -0700 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.0 |
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.