Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Tue Dec 16 16:41:39 CET 2008

None!

Files with MOODLE_18_MERGED tag not updated - Tue Dec 16 16:54:52 CET 2008

None!

Files with MOODLE_19_MERGED tag not updated - Thu Dec 18 01:30:37 CET 2008

RCS file: /cvsroot/moodle/blocks/search/block_search.php
 
RCS file: /cvsroot/moodle/blocks/search/config_global.html
 
RCS file: /cvsroot/moodle/course/lib.php
< <?php  // $Id: lib.php,v 1.538.2.65 2008/12/11 10:47:57 tjhunt Exp $ 
> <?php  // $Id: lib.php,v 1.538.2.66 2008/12/17 12:40:09 sam_marshall Exp $ 
 
RCS file: /cvsroot/moodle/course/view.php
< <?php // $Id: view.php,v 1.106.2.4 2008/04/25 14:09:07 skodak Exp $ 
> <?php // $Id: view.php,v 1.106.2.5 2008/12/17 12:40:09 sam_marshall Exp $ 
 
RCS file: /cvsroot/moodle/install/lang/eu_utf8/installer.php
 
RCS file: /cvsroot/moodle/install/lang/nl_utf8/installer.php
 
RCS file: /cvsroot/moodle/lang/en_utf8/block_search.php
 
RCS file: /cvsroot/moodle/lib/accesslib.php
 
RCS file: /cvsroot/moodle/search/LISEZMOI.txt
 
RCS file: /cvsroot/moodle/search/README.txt
 
RCS file: /cvsroot/moodle/search/add.php
 
RCS file: /cvsroot/moodle/search/cron.php
 
RCS file: /cvsroot/moodle/search/delete.php
 
RCS file: /cvsroot/moodle/search/indexer.php
 
RCS file: /cvsroot/moodle/search/indexersplash.php
 
RCS file: /cvsroot/moodle/search/indexlib.php
 
RCS file: /cvsroot/moodle/search/lib.php
 
RCS file: /cvsroot/moodle/search/query.php
 
RCS file: /cvsroot/moodle/search/querylib.php
 
RCS file: /cvsroot/moodle/search/stats.php
 
RCS file: /cvsroot/moodle/search/update.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Exception.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Document.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Exception.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/FSM.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/FSMAction.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Field.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Interface.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/PriorityQueue.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Proxy.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/Analyzer.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/Token.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter.php
 
RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common.p

hp]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Text.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Com

mon/Text.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/

Common/TextNum.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Com

mon/Utf8.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Utf8Num.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/

Common/Utf8Num.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/Text/CaseInsensitive.php /cvsroot/moodle/search/Zend/Search/Lucene/Analy

sis/Analyzer/Common/Text/CaseInsensitive.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/Analyzer/Common/TextNum/CaseInsensitive.php /cvsroot/moodle/search/Zend/Search/Lucene/An

alysis/Analyzer/Common/TextNum/CaseInsensitive.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter/LowerCase.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter

/LowerCase.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter/LowerCaseUtf8.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/TokenFi

lter/LowerCaseUtf8.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter/ShortWords.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/TokenFilte

r/ShortWords.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter/StopWords.php /cvsroot/moodle/search/Zend/Search/Lucene/Analysis/TokenFilter

/StopWords.php]

RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Document/Html.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Index/DictionaryLoader.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Index/FieldInfo.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Index/SegmentInfo.php
 
RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Index/SegmentInfoPriorityQueue.php /cvsroot/moodle/search/Zend/Search/Lucene/Index/SegmentInfoPri

orityQueue.php]

RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Index/SegmentMerger.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Index/SegmentWriter.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Index/Term.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Index/TermInfo.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Index/Writer.php
 
RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Index/SegmentWriter/DocumentWriter.php /cvsroot/moodle/search/Zend/Search/Lucene/Index/SegmentWri

ter/DocumentWriter.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Index/SegmentWriter/StreamWriter.php /cvsroot/moodle/search/Zend/Search/Lucene/Index/SegmentWrite

r/StreamWriter.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Search/BooleanExpressionRecognizer.php /cvsroot/moodle/search/Zend/Search/Lucene/Search/BooleanEx

pressionRecognizer.php]

RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Query.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryEntry.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryHit.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryLexer.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryParser.php
 
RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Search/QueryParserContext.php /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryParserContext

.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Search/QueryParserException.php /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryParserExcep

tion.php]

RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryToken.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Similarity.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Weight.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Query/Boolean.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Query/Empty.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Query/MultiTerm.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Query/Phrase.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Query/Term.php
 
RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Search/QueryEntry/Phrase.php /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryEntry/Phrase.p

hp]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Search/QueryEntry/Subquery.php /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryEntry/Subque

ry.php]

RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/QueryEntry/Term.php
 
RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Search/Similarity/Default.php /cvsroot/moodle/search/Zend/Search/Lucene/Search/Similarity/Default

.php]

RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Weight/Boolean.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Weight/Empty.php
 
RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Search/Weight/MultiTerm.php /cvsroot/moodle/search/Zend/Search/Lucene/Search/Weight/MultiTerm.php

]

RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Weight/Phrase.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Search/Weight/Term.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Storage/Directory.php
 
RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Storage/File.php
 
RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Storage/Directory/Filesystem.php /cvsroot/moodle/search/Zend/Search/Lucene/Storage/Directory/File

system.php]

RCS file: [http://cvs.moodle.org/moodle/search/Zend/Search/Lucene/Storage/File/Filesystem.php /cvsroot/moodle/search/Zend/Search/Lucene/Storage/File/Filesystem.php

]

RCS file: /cvsroot/moodle/search/Zend/Search/Lucene/Storage/File/Memory.php
 
RCS file: /cvsroot/moodle/search/documents/chat_document.php
 
RCS file: /cvsroot/moodle/search/documents/data_document.php
 
RCS file: /cvsroot/moodle/search/documents/document.php
 
RCS file: /cvsroot/moodle/search/documents/forum_document.php
 
RCS file: /cvsroot/moodle/search/documents/glossary_document.php
 
RCS file: /cvsroot/moodle/search/documents/lesson_document.php
 
RCS file: /cvsroot/moodle/search/documents/physical_doc.php
 
RCS file: /cvsroot/moodle/search/documents/physical_htm.php
 
RCS file: /cvsroot/moodle/search/documents/physical_html.php
 
RCS file: /cvsroot/moodle/search/documents/physical_pdf.php
 
RCS file: /cvsroot/moodle/search/documents/physical_ppt.php
 
RCS file: /cvsroot/moodle/search/documents/physical_txt.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php
 
RCS file: /cvsroot/moodle/search/documents/resource_document.php
 
RCS file: /cvsroot/moodle/search/documents/wiki_document.php
 
RCS file: /cvsroot/moodle/search/tests/index.php

To generate this information yourself

Run the following commandline at the top level of your CVS sandbox:

cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt

Some useful links

• Moodle CVS for developers: explains how to work with the Moodle code in CVS.
• Review Unmerged files, please... discussion from moodle.org forums.

• Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files.