Note: You are currently viewing documentation for Moodle 3.3. Up-to-date documentation for the latest stable version of Moodle is probably available here: Unmerged files.

Development:Unmerged files: Difference between revisions

From MoodleDocs
Line 71: Line 71:
  RCS file: [http://cvs.moodle.org/moodle/search/documents/wiki_document.php /cvsroot/moodle/search/documents/wiki_document.php]
  RCS file: [http://cvs.moodle.org/moodle/search/documents/wiki_document.php /cvsroot/moodle/search/documents/wiki_document.php]


==Files with MOODLE_19_MERGED tag not updated - Mon Apr 7 00:03:22 CEST 2008 ==
==Files with MOODLE_19_MERGED tag not updated - Tue Apr 8 04:34:08 CEST 2008 ==
    
    
  RCS file: [http://cvs.moodle.org/moodle/admin/langimport.php /cvsroot/moodle/admin/langimport.php]
  RCS file: [http://cvs.moodle.org/moodle/admin/langimport.php /cvsroot/moodle/admin/langimport.php]
  < <?php //$Id: langimport.php,v 1.36.2.7 2008/04/02 06:09:57 dongsheng Exp $  
  < <?php //$Id: langimport.php,v 1.36.2.7 2008/04/02 06:09:57 dongsheng Exp $  
  > <?php //$Id: langimport.php,v 1.36.2.8 2008/04/02 06:50:20 skodak Exp $  
  > <?php //$Id: langimport.php,v 1.36.2.8 2008/04/02 06:50:20 skodak Exp $  
 
RCS file: [http://cvs.moodle.org/moodle/admin/mnet/peers.php /cvsroot/moodle/admin/mnet/peers.php]
< <?PHP // $Id: peers.php,v 1.14.2.2 2008/04/02 06:09:58 dongsheng Exp $
> <?PHP // $Id: peers.php,v 1.14.2.3 2008/04/08 01:45:25 dongsheng Exp $
 
RCS file: [http://cvs.moodle.org/moodle/blocks/rss_client/block_rss_client_action.php /cvsroot/moodle/blocks/rss_client/block_rss_client_action.php]
< <?php //$Id: block_rss_client_action.php,v 1.54.2.3 2008/04/02 06:09:59 dongsheng Exp $
> <?php //$Id: block_rss_client_action.php,v 1.54.2.4 2008/04/08 01:45:25 dongsheng Exp $
< * @version  $Id: block_rss_client_action.php,v 1.54.2.3 2008/04/02 06:09:59 dongsheng Exp $
> * @version  $Id: block_rss_client_action.php,v 1.54.2.4 2008/04/08 01:45:25 dongsheng Exp $
 
RCS file: [http://cvs.moodle.org/moodle/blocks/search/block_search.php /cvsroot/moodle/blocks/search/block_search.php]
 
RCS file: [http://cvs.moodle.org/moodle/blocks/search/config_global.html /cvsroot/moodle/blocks/search/config_global.html]
 
RCS file: [http://cvs.moodle.org/moodle/course/import/groups/index.php /cvsroot/moodle/course/import/groups/index.php]
    
    
  RCS file: [http://cvs.moodle.org/moodle/lib/accesslib.php /cvsroot/moodle/lib/accesslib.php]
  RCS file: [http://cvs.moodle.org/moodle/lib/accesslib.php /cvsroot/moodle/lib/accesslib.php]
Line 82: Line 98:
  < <?php  // $Id: lib.php,v 1.282.2.12 2008/02/21 12:21:44 nicolasconnault Exp $  
  < <?php  // $Id: lib.php,v 1.282.2.12 2008/02/21 12:21:44 nicolasconnault Exp $  
  > <?php  // $Id: lib.php,v 1.282.2.13 2008/03/19 12:21:54 tjhunt Exp $  
  > <?php  // $Id: lib.php,v 1.282.2.13 2008/03/19 12:21:54 tjhunt Exp $  
 
RCS file: [http://cvs.moodle.org/moodle/search/LISEZMOI.txt /cvsroot/moodle/search/LISEZMOI.txt]
 
RCS file: [http://cvs.moodle.org/moodle/search/READMETOO.txt /cvsroot/moodle/search/READMETOO.txt]
 
RCS file: [http://cvs.moodle.org/moodle/search/add.php /cvsroot/moodle/search/add.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/cron_php5.php /cvsroot/moodle/search/cron_php5.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/delete.php /cvsroot/moodle/search/delete.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/index.php /cvsroot/moodle/search/index.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/indexer.php /cvsroot/moodle/search/indexer.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/indexersplash.php /cvsroot/moodle/search/indexersplash.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/indexlib.php /cvsroot/moodle/search/indexlib.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/lib.php /cvsroot/moodle/search/lib.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/query.php /cvsroot/moodle/search/query.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/querylib.php /cvsroot/moodle/search/querylib.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/stats.php /cvsroot/moodle/search/stats.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/update.php /cvsroot/moodle/search/update.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/chat_document.php /cvsroot/moodle/search/documents/chat_document.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/data_document.php /cvsroot/moodle/search/documents/data_document.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/document.php /cvsroot/moodle/search/documents/document.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/forum_document.php /cvsroot/moodle/search/documents/forum_document.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/glossary_document.php /cvsroot/moodle/search/documents/glossary_document.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/lesson_document.php /cvsroot/moodle/search/documents/lesson_document.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_doc.php /cvsroot/moodle/search/documents/physical_doc.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_htm.php /cvsroot/moodle/search/documents/physical_htm.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_html.php /cvsroot/moodle/search/documents/physical_html.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_pdf.php /cvsroot/moodle/search/documents/physical_pdf.php]
    
    
  RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_ppt.php /cvsroot/moodle/search/documents/physical_ppt.php]
  RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_ppt.php /cvsroot/moodle/search/documents/physical_ppt.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_txt.php /cvsroot/moodle/search/documents/physical_txt.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/physical_xml.php /cvsroot/moodle/search/documents/physical_xml.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/resource_document.php /cvsroot/moodle/search/documents/resource_document.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/techproject_document.php /cvsroot/moodle/search/documents/techproject_document.php]
 
RCS file: [http://cvs.moodle.org/moodle/search/documents/wiki_document.php /cvsroot/moodle/search/documents/wiki_document.php]


==To generate this information yourself==
==To generate this information yourself==

Revision as of 02:36, 8 April 2008


Files with MOODLE_17_MERGED tag not updated - Mon Apr 7 00:03:29 CEST 2008

none!

Files with MOODLE_18_MERGED tag not updated - Tue Apr 8 04:33:50 CEST 2008

RCS file: /cvsroot/moodle/blocks/search/block_search.php
 
RCS file: /cvsroot/moodle/blocks/search/config_global.html
 
RCS file: /cvsroot/moodle/search/LISEZMOI.txt
 
RCS file: /cvsroot/moodle/search/add.php
 
RCS file: /cvsroot/moodle/search/cron.php
 
RCS file: /cvsroot/moodle/search/cron_php5.php
 
RCS file: /cvsroot/moodle/search/delete.php
 
RCS file: /cvsroot/moodle/search/index.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/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/techproject_document.php
 
RCS file: /cvsroot/moodle/search/documents/wiki_document.php

Files with MOODLE_19_MERGED tag not updated - Tue Apr 8 04:34:08 CEST 2008

RCS file: /cvsroot/moodle/admin/langimport.php
< <?php //$Id: langimport.php,v 1.36.2.7 2008/04/02 06:09:57 dongsheng Exp $ 
> <?php //$Id: langimport.php,v 1.36.2.8 2008/04/02 06:50:20 skodak Exp $ 
 
RCS file: /cvsroot/moodle/admin/mnet/peers.php
< <?PHP // $Id: peers.php,v 1.14.2.2 2008/04/02 06:09:58 dongsheng Exp $ 
> <?PHP // $Id: peers.php,v 1.14.2.3 2008/04/08 01:45:25 dongsheng Exp $ 
 
RCS file: /cvsroot/moodle/blocks/rss_client/block_rss_client_action.php
< <?php //$Id: block_rss_client_action.php,v 1.54.2.3 2008/04/02 06:09:59 dongsheng Exp $ 
> <?php //$Id: block_rss_client_action.php,v 1.54.2.4 2008/04/08 01:45:25 dongsheng Exp $ 
< * @version  $Id: block_rss_client_action.php,v 1.54.2.3 2008/04/02 06:09:59 dongsheng Exp $ 
> * @version  $Id: block_rss_client_action.php,v 1.54.2.4 2008/04/08 01:45:25 dongsheng Exp $ 
 
RCS file: /cvsroot/moodle/blocks/search/block_search.php
 
RCS file: /cvsroot/moodle/blocks/search/config_global.html
 
RCS file: /cvsroot/moodle/course/import/groups/index.php
 
RCS file: /cvsroot/moodle/lib/accesslib.php
 
RCS file: /cvsroot/moodle/mod/quiz/lib.php
< <?php  // $Id: lib.php,v 1.282.2.12 2008/02/21 12:21:44 nicolasconnault Exp $ 
> <?php  // $Id: lib.php,v 1.282.2.13 2008/03/19 12:21:54 tjhunt Exp $ 
 
RCS file: /cvsroot/moodle/search/LISEZMOI.txt
 
RCS file: /cvsroot/moodle/search/READMETOO.txt
 
RCS file: /cvsroot/moodle/search/add.php
 
RCS file: /cvsroot/moodle/search/cron_php5.php
 
RCS file: /cvsroot/moodle/search/delete.php
 
RCS file: /cvsroot/moodle/search/index.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/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/techproject_document.php
 
RCS file: /cvsroot/moodle/search/documents/wiki_document.php

To generate this information yourself

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

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

Some useful links

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