couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jan Lehnardt <...@apache.org>
Subject Re: git commit: Revert "Revert "Revert "Make sure that local_dev.ini is writable"""
Date Mon, 30 Apr 2012 16:35:29 GMT

On Apr 30, 2012, at 17:26 , Paul Davis wrote:

> This series of commits confuses me greatly.

Sorry.

> There are a lot of reverts

The sequence is this:

You added chmod +w.
I reverted chmod +w.
I accidentally added chmod +w, but called it "Revert" (i.e. this commit should never have
been pushed)
I reverted the previous commit, effectively removing chmod +w, adding another "Revert" for
funsies.

> and the explanation of it breaking compilation from read only media is
> incorrect.

Why is the explanation incorrect?

> This file should be writable or ./utils/run in a VPATH build can't
> edit its configuration which is incorrect.

Then we can't use utils/run to start CouchDB to run the JS tests against in make [dist]check.
What alternative would you recommend?


> Also it breaks the tests.

Yes, as I said in the previous mail, I'm trying find a fix that doesn't require writing to
local_dev.ini when running the tests.

Cheers
Jan
-- 




> 
> On Mon, Apr 30, 2012 at 6:24 AM, Jan Lehnardt <jan@apache.org> wrote:
>> Sorry :)
>> 
>> On Apr 30, 2012, at 12:23 , jan@apache.org wrote:
>> 
>>> Updated Branches:
>>>  refs/heads/master bdcfcca1e -> 9acc34ed9
>>> 
>>> 
>>> Revert "Revert "Revert "Make sure that local_dev.ini is writable"""
>>> 
>>> Revert. Git <3.
>>> 
>>> This reverts commit bdcfcca1ec92f379e5376741e5ab103630573ac4.
>>> 
>>> 
>>> Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9acc34ed
>>> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9acc34ed
>>> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9acc34ed
>>> 
>>> Branch: refs/heads/master
>>> Commit: 9acc34ed9ed4315f7cd6f5b8ac45e47f2c0b8cb6
>>> Parents: bdcfcca1
>>> Author: Jan Lehnardt <jan@apache.org>
>>> Authored: Mon Apr 30 12:23:00 2012 +0100
>>> Committer: Jan Lehnardt <jan@apache.org>
>>> Committed: Mon Apr 30 12:23:00 2012 +0100
>>> 
>>> ----------------------------------------------------------------------
>>> etc/couchdb/Makefile.am |    1 -
>>> 1 files changed, 0 insertions(+), 1 deletions(-)
>>> ----------------------------------------------------------------------
>>> 
>>> 
>>> http://git-wip-us.apache.org/repos/asf/couchdb/blob/9acc34ed/etc/couchdb/Makefile.am
>>> ----------------------------------------------------------------------
>>> diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am
>>> index fe045f9..dd1054b 100644
>>> --- a/etc/couchdb/Makefile.am
>>> +++ b/etc/couchdb/Makefile.am
>>> @@ -73,7 +73,6 @@ default_dev.ini: default.ini.tpl
>>> local_dev.ini: local.ini
>>>       if test ! -f "$@"; then \
>>>           cp $< $@; \
>>> -             chmod +w $@; \
>>>       fi
>>> 
>>> install-data-hook:
>>> 
>> 


Mime
View raw message