Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9F3DAD06A for ; Thu, 14 Mar 2013 14:07:22 +0000 (UTC) Received: (qmail 68574 invoked by uid 500); 14 Mar 2013 14:07:22 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 67792 invoked by uid 500); 14 Mar 2013 14:07:20 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 67755 invoked by uid 99); 14 Mar 2013 14:07:19 -0000 Received: from minotaur.apache.org (HELO minotaur.apache.org) (140.211.11.9) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Mar 2013 14:07:19 +0000 Received: from localhost (HELO mail-ie0-f170.google.com) (127.0.0.1) (smtp-auth username nslater, mechanism plain) by minotaur.apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Mar 2013 14:07:19 +0000 Received: by mail-ie0-f170.google.com with SMTP id c11so3059366ieb.15 for ; Thu, 14 Mar 2013 07:07:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-received:x-originating-ip:in-reply-to:references :date:message-id:subject:from:to:cc:content-type:x-gm-message-state; bh=raeGShrfwOotQZ3/VW6nKhh8UZjRY3oGgYaUuowyJmY=; b=Vqk70cn6eJk+uqv0vuXt+hAR3LR59qpbvM64hAgwlNmlavm7DcCiyf4LsZWyGA43y1 Cs1iqwcCN378zmob6HAXRpzNzi+LwvTa20OopNP7TzVnrNUMeyEXsxe1abm7YffEtOsU QESb+yyXN4TmxQn1irPNXM5M5vIPiG9LnjrHahtZ8VMcwZY3C1rboC+Ch3UKotX1ZYY2 Jg4+ISza4bxDFxt2ClYDVOVG5y+/p5uxEs61n3Md8r6JVX7YXbISfjx2rtIvgHMFlLSz TI548tVpJNiYDxaf3fbj/gkiqcLPxfQDtW6mnNB/P7kOsa3qXQ3Gk4YSmN5Glq8MSLJF At6A== MIME-Version: 1.0 X-Received: by 10.50.186.165 with SMTP id fl5mr19628513igc.81.1363270038475; Thu, 14 Mar 2013 07:07:18 -0700 (PDT) Received: by 10.50.188.202 with HTTP; Thu, 14 Mar 2013 07:07:18 -0700 (PDT) X-Originating-IP: [178.250.115.206] In-Reply-To: References: <20130314112810.DAA6A1691A@tyr.zones.apache.org> Date: Thu, 14 Mar 2013 14:07:18 +0000 Message-ID: Subject: Re: [2/2] git commit: Yanked .gitignore from master From: Noah Slater To: "dev@couchdb.apache.org" Cc: commits@couchdb.apache.org Content-Type: multipart/alternative; boundary=14dae93411b960c11604d7e30af8 X-Gm-Message-State: ALoCoQkrQoJ1BHo/wfhcs7aSzKZXvQxanjna/J238tDS1x7klwxavsxXlPEYwrWo+BKed8Vd6eMM --14dae93411b960c11604d7e30af8 Content-Type: text/plain; charset=ISO-8859-1 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 wrote: > > On Mar 14, 2013, at 12:28 , nslater@apache.org 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 > > Authored: Thu Mar 14 11:28:00 2013 +0000 > > Committer: Noah Slater > > 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 --14dae93411b960c11604d7e30af8 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Because I was working on the 1.2.x branch and it was compl= aining 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 i= mportant to be=A0discriminate. If you like, I can revert?


On 14 March 2= 013 13:35, Jan Lehnardt <jan@apache.org> wrote:

On Mar 14, 2013, at 12:28 , nslater@a= pache.org wrote:

> Updated Branches:
> =A0refs/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/couch= db/commit/9dd0c512
> Tree: http://git-wip-us.apache.org/repos/asf/couchdb/t= ree/9dd0c512
> Diff: http://git-wip-us.apache.org/repos/asf/couchdb/d= iff/9dd0c512
>
> Branch: refs/heads/1.2.x
> Commit: 9dd0c5124d58f9ae70203bd9c88f4117d4c263bb
> Parents: e7418c8
> Author: Noah Slater <nslater@= apache.org>
> Authored: Thu Mar 14 11:28:00 2013 +0000
> Committer: Noah Slater <nslat= er@apache.org>
> Committed: Thu Mar 14 11:28:00 2013 +0000
>
> ----------------------------------------------------------------------=
> .gitignore | =A0146 ++++++++++++++++++++++++++------------------------= ----
> 1 files changed, 70 insertions(+), 76 deletions(-)
> ----------------------------------------------------------------------=
>
>
> http://git-wip-us.apache.org/repos/asf/couc= hdb/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
--14dae93411b960c11604d7e30af8--