Because I was working on the 1.2.x branch and it was complaining about .DS_Store files. So I figured I'd just grab the latest and greatest. It's a source machinery file, so I didn't think it was important to be discriminate. If you like, I can revert?
On 14 March 2013 13:35, Jan Lehnardt <[email protected]> wrote: > > On Mar 14, 2013, at 12:28 , [email protected] wrote: > > > Updated Branches: > > refs/heads/1.2.x e2eb3e92d -> 9dd0c5124 > > > > > > Yanked .gitignore from master > > Why? > > > > > > > Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo > > Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9dd0c512 > > Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9dd0c512 > > Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9dd0c512 > > > > Branch: refs/heads/1.2.x > > Commit: 9dd0c5124d58f9ae70203bd9c88f4117d4c263bb > > Parents: e7418c8 > > Author: Noah Slater <[email protected]> > > Authored: Thu Mar 14 11:28:00 2013 +0000 > > Committer: Noah Slater <[email protected]> > > Committed: Thu Mar 14 11:28:00 2013 +0000 > > > > ---------------------------------------------------------------------- > > .gitignore | 146 ++++++++++++++++++++++++++---------------------------- > > 1 files changed, 70 insertions(+), 76 deletions(-) > > ---------------------------------------------------------------------- > > > > > > http://git-wip-us.apache.org/repos/asf/couchdb/blob/9dd0c512/.gitignore > > ---------------------------------------------------------------------- > > diff --git a/.gitignore b/.gitignore > > index cbf2b42..d3217db 100644 > > --- a/.gitignore > > +++ b/.gitignore > > @@ -1,61 +1,71 @@ > > +!.gitignore > > +!.mailmap > > *.beam > > +*.diff > > *.gz > > -*.tpl > > -*.o > > -*.lo > > *.la > > -*.m4 > > -*.in > > -*~ > > +*.lo > > +*.o > > *.orig > > *.rej > > -erl_crash.dump > > -configure > > -autom4te.cache > > -build-aux > > -*.diff > > - > > -# ./configure > > - > > +*.stamp > > +*.sw* > > +*.tpl > > +*~ > > +.* > > +INSTALL > > Makefile > > -bin/Makefile > > +Makefile.in > > +THANKS > > +acinclude.m4 > > +aclocal.m4 > > +apache-couchdb-* > > +autom4te.cache > > +bin/.deps/ > > +bin/couch-config > > +bin/couch-config_dev > > +bin/couchdb > > +bin/couchdb.1 > > +bin/couchjs_dev > > +bin/couchpw > > +build-aux/config.* > > +build-aux/depcomp > > +build-aux/install-sh > > +build-aux/ltmain.sh > > +build-aux/missing > > +build-aux/texinfo.tex > > config.h > > +config.h.in > > config.log > > config.status > > -etc/Makefile > > -etc/couchdb/Makefile > > -etc/default/Makefile > > -etc/init/Makefile > > -etc/init/couchdb > > -etc/launchd/Makefile > > -etc/logrotate.d/Makefile > > -libtool > > -share/Makefile > > -src/couchdb/.deps/* > > -src/couchdb/Makefile > > -src/couchdb/priv/Makefile > > -src/mochiweb/Makefile > > -stamp-h1 > > -test/.deps/ > > -test/Makefile > > -test/javascript/run_js_tests.sh > > -var/Makefile > > - > > -# for make > > - > > -bin/couchdb > > -bin/couchdb.1 > > -bin/couch-config > > -bin/couch-config_dev > > +configure > > +couchdb.stderr > > +couchdb.stdout > > +cover/* > > +erl_crash.dump > > etc/couchdb/default.ini > > +etc/couchdb/default_dev.ini > > +etc/couchdb/local_dev.ini > > +etc/init/couchdb > > etc/launchd/org.apache.couchdb.plist > > etc/logrotate.d/couchdb > > +libtool > > +m4 > > +share/doc/build/CouchDB.log > > +share/doc/build/doctrees > > +share/doc/build/html > > +share/doc/build/latex > > +share/doc/build/texinfo > > +share/server/main-coffee.js > > +share/server/main.js > > +src/couch_mrview/ebin/ > > +src/couch_replicator/ebin/ > > +src/couchdb/.deps/* > > src/couchdb/.libs/* > > src/couchdb/couch.app > > src/couchdb/couchjs > > src/couchdb/edoc-info > > src/couchdb/erlang.png > > -src/couchdb/stylesheet.css > > src/couchdb/priv/.deps/ > > src/couchdb/priv/.libs/ > > src/couchdb/priv/couch_icu_driver.la > > @@ -63,52 +73,36 @@ src/couchdb/priv/couchjs > > src/couchdb/priv/couchjs.1 > > src/couchdb/priv/couchspawnkillable > > src/couchdb/priv/stat_descriptions.cfg > > -src/erlang-oauth/oauth.app > > -src/ibrowse/ibrowse.app > > -src/ejson/ejson.app > > +src/couchdb/priv/stat_descriptions.cfg > > +src/couchdb/stylesheet.css > > src/ejson/.deps/ > > src/ejson/.libs/ > > +src/ejson/ejson.app > > src/ejson/priv > > +src/erlang-oauth/oauth.app > > +src/erlang-oauth/oauth.app > > +src/ibrowse/ibrowse.app > > +src/ibrowse/ibrowse.app > > +src/mochiweb/mochiweb.app > > src/mochiweb/mochiweb.app > > src/snappy/.deps/ > > src/snappy/.libs/ > > -src/snappy/priv > > -src/snappy/snappy.app > > +src/snappy/google-snappy/.deps/ > > src/snappy/google-snappy/snappy-stubs-public.h > > src/snappy/google-snappy/stamp-h2 > > -src/snappy/google-snappy/.deps/ > > -test/local.ini > > +src/snappy/priv > > +src/snappy/snappy.app > > +stamp-h1 > > +test/.deps/ > > +test/bench/run > > test/etap/.deps/ > > test/etap/run > > +test/etap/run > > +test/etap/temp.* > > test/etap/test_cfg_register > > test/etap/test_util.erl > > test/javascript/run > > -share/server/main.js > > -share/server/main-coffee.js > > - > > -# for make dev > > - > > -bin/.deps/ > > -bin/couchjs_dev > > -bin/couchpw > > -etc/couchdb/default_dev.ini > > -etc/couchdb/local_dev.ini > > -utils/run > > +test/javascript/run_js_tests.sh > > +test/local.ini > > tmp > > -src/couchdb/priv/stat_descriptions.cfg > > -src/erlang-oauth/oauth.app > > -src/ibrowse/ibrowse.app > > -src/mochiweb/mochiweb.app > > -test/etap/run > > - > > -# for make check > > - > > -test/etap/temp.* > > -test/bench/run > > -couchdb.stderr > > -couchdb.stdout > > - > > -# for make cover > > - > > -cover/* > > -INSTALL > > +utils/run > > > > -- NS
