couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r937633 - /couchdb/trunk/src/couchdb/couch_view.erl
Date Sat, 24 Apr 2010 15:30:08 GMT
Author: jan
Date: Sat Apr 24 15:30:08 2010
New Revision: 937633

URL: http://svn.apache.org/viewvc?rev=937633&view=rev
Log:
tabs to spaces

Modified:
    couchdb/trunk/src/couchdb/couch_view.erl

Modified: couchdb/trunk/src/couchdb/couch_view.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_view.erl?rev=937633&r1=937632&r2=937633&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_view.erl (original)
+++ couchdb/trunk/src/couchdb/couch_view.erl Sat Apr 24 15:30:08 2010
@@ -90,8 +90,8 @@ cleanup_index_files(Db) ->
 
     % filter out the ones in use
     DeleteFiles = [FilePath
-		   || FilePath <- FileList,
-		      re:run(FilePath, RegExp, [{capture, none}]) =:= nomatch],
+           || FilePath <- FileList,
+              re:run(FilePath, RegExp, [{capture, none}]) =:= nomatch],
     % delete unused files
     ?LOG_DEBUG("deleting unused view index files: ~p",[DeleteFiles]),
     [file:delete(File)||File <- DeleteFiles],
@@ -369,6 +369,7 @@ nuke_dir(Dir) ->
 
 % keys come back in the language of btree - tuples.
 less_json_ids({JsonA, IdA}, {JsonB, IdB}) ->
+<<<<<<< HEAD
     case less_json0(JsonA, JsonB) of
     0 ->
         IdA < IdB;



Mime
View raw message