|
|
| (236 intermediate revisions by 5 users not shown) |
| Line 1: |
Line 1: |
| | __NOEDITSECTION__ |
| | ==Unmerged Files Report== |
|
| |
|
| | | __UNMERGED_FILES_REPORT__ |
| ==Files with MOODLE_17_MERGED tag not updated - Sun Nov 11 10:47:00 CET 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/help.php /cvsroot/moodle/moodle/help.php]
| |
| < * @version $Id: help.php,v 1.40.2.1 2007/11/06 13:25:22 nicolasconnault Exp $
| |
| > * @version $Id: help.php,v 1.34.4.1 2007/11/06 13:25:34 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/type/ims/finder.php /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/ewiki.php /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/plugins/init.php /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/wiki/ewiki/plugins/spages.php /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php]
| |
| | |
| ==Files with MOODLE_18_MERGED tag not updated - Sun Nov 11 10:47:10 CET 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/help.php /cvsroot/moodle/moodle/help.php]
| |
| < * @version $Id: help.php,v 1.38.2.2 2007/05/23 13:36:29 nfreear Exp $
| |
| > * @version $Id: help.php,v 1.38.2.3 2007/11/06 13:38:34 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/blocks.php /cvsroot/moodle/moodle/admin/blocks.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mnet/peers.html /cvsroot/moodle/moodle/admin/mnet/peers.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/mnet/auth.php /cvsroot/moodle/moodle/auth/mnet/auth.php]
| |
| < <?php // $Id: auth.php,v 1.14.2.13 2007/10/11 13:19:53 nicolasconnault Exp $
| |
| > <?php // $Id: auth.php,v 1.14.2.15 2007/11/01 06:13:19 donal72 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/blocks/loancalc/block_loancalc.php /cvsroot/moodle/moodle/blocks/loancalc/block_loancalc.php]
| |
| < <?php // $Id: block_loancalc.php,v 1.9 2007/01/10 06:44:15 vyshane Exp $
| |
| > <?php // $Id: block_loancalc.php,v 1.9.2.1 2007/10/22 20:29:45 arborrow Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/blocks/search/block_search.php /cvsroot/moodle/moodle/blocks/search/block_search.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/blocks/search/config_global.html /cvsroot/moodle/moodle/blocks/search/config_global.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/blocks/search/db/upgrade.php /cvsroot/moodle/moodle/blocks/search/db/upgrade.php]
| |
| < <?php //$Id: upgrade.php,v 1.1 2006/10/26 16:33:59 stronk7 Exp $
| |
| > <?php //$Id: upgrade.php,v 1.1.6.1 2007/11/08 20:13:50 diml Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/config.html /cvsroot/moodle/moodle/enrol/mnet/config.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/enrol.php /cvsroot/moodle/moodle/enrol/mnet/enrol.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/enrol_mnet.php /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/mnet.php /cvsroot/moodle/moodle/lang/en_utf8/mnet.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/javascript-static.js /cvsroot/moodle/moodle/lib/javascript-static.js]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/testclient.php /cvsroot/moodle/moodle/mnet/testclient.php]
| |
| > <?php // $Id: testclient.php,v 1.1.2.2 2007/10/19 00:45:56 donal72 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/client.php /cvsroot/moodle/moodle/mnet/xmlrpc/client.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/server.php /cvsroot/moodle/moodle/mnet/xmlrpc/server.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/xmlparser.php /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/add.php /cvsroot/moodle/moodle/search/add.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/cron.php /cvsroot/moodle/moodle/search/cron.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/delete.php /cvsroot/moodle/moodle/search/delete.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/index.php /cvsroot/moodle/moodle/search/index.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/indexer.php /cvsroot/moodle/moodle/search/indexer.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/indexersplash.php /cvsroot/moodle/moodle/search/indexersplash.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/indexlib.php /cvsroot/moodle/moodle/search/indexlib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/lib.php /cvsroot/moodle/moodle/search/lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/query.php /cvsroot/moodle/moodle/search/query.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/querylib.php /cvsroot/moodle/moodle/search/querylib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/stats.php /cvsroot/moodle/moodle/search/stats.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/update.php /cvsroot/moodle/moodle/search/update.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/document.php /cvsroot/moodle/moodle/search/documents/document.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/forum_document.php /cvsroot/moodle/moodle/search/documents/forum_document.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/glossary_document.php /cvsroot/moodle/moodle/search/documents/glossary_document.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/resource_document.php /cvsroot/moodle/moodle/search/documents/resource_document.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/search/documents/wiki_document.php /cvsroot/moodle/moodle/search/documents/wiki_document.php]
| |
| | |
| ==Files with MOODLE_19_MERGED tag not updated - Thu Nov 8 02:03:32 CET 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/help.php /cvsroot/moodle/moodle/help.php]
| |
| < * @version $Id: help.php,v 1.40 2007/05/23 12:03:22 nfreear Exp $
| |
| > * @version $Id: help.php,v 1.40.2.1 2007/11/06 13:25:22 nicolasconnault Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mnet/peers.html /cvsroot/moodle/moodle/admin/mnet/peers.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/mnet/auth.php /cvsroot/moodle/moodle/auth/mnet/auth.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/blocks/loancalc/block_loancalc.php /cvsroot/moodle/moodle/blocks/loancalc/block_loancalc.php]
| |
| < <?php // $Id: block_loancalc.php,v 1.9 2007/01/10 06:44:15 vyshane Exp $
| |
| > <?php // $Id: block_loancalc.php,v 1.9.4.1 2007/10/22 20:37:53 arborrow Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/imsenterprise/enrol.php /cvsroot/moodle/moodle/enrol/imsenterprise/enrol.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/config.html /cvsroot/moodle/moodle/enrol/mnet/config.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/enrol/mnet/enrol.php /cvsroot/moodle/moodle/enrol/mnet/enrol.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/group/autogroup.php /cvsroot/moodle/moodle/group/autogroup.php]
| |
| < <?php // $Id: autogroup.php,v 1.1 2007/09/24 21:55:15 mattc-catalyst Exp $
| |
| > <?php // $Id: autogroup.php,v 1.1.2.1 2007/10/18 03:00:23 mattc-catalyst Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/enrol_mnet.php /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/glossary.php /cvsroot/moodle/moodle/lang/en_utf8/glossary.php]
| |
| < <?PHP // $Id: glossary.php,v 1.9 2007/11/01 14:51:29 nicolasconnault Exp $
| |
| > <?PHP // $Id: glossary.php,v 1.8 2007/09/24 17:09:37 nfreear Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/group.php /cvsroot/moodle/moodle/lang/en_utf8/group.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/mnet.php /cvsroot/moodle/moodle/lang/en_utf8/mnet.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/surveys.html /cvsroot/moodle/moodle/lang/en_utf8/help/surveys.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/uploadusers2.html /cvsroot/moodle/moodle/lang/en_utf8/help/uploadusers2.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/help/question/permissions.html /cvsroot/moodle/moodle/lang/en_utf8/help/question/permissions.html]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/javascript-static.js /cvsroot/moodle/moodle/lib/javascript-static.js]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/testclient.php /cvsroot/moodle/moodle/mnet/testclient.php]
| |
| < <?php // $Id: testclient.php,v 1.2 2007/08/29 10:48:47 stronk7 Exp $
| |
| > <?php // $Id: testclient.php,v 1.2.2.2 2007/10/19 00:44:40 donal72 Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/client.php /cvsroot/moodle/moodle/mnet/xmlrpc/client.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/server.php /cvsroot/moodle/moodle/mnet/xmlrpc/server.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/xmlparser.php /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/quiz/attempt.php /cvsroot/moodle/moodle/mod/quiz/attempt.php]
| |
| < <?php // $Id: attempt.php,v 1.131.2.3 2007/11/02 16:20:06 tjhunt Exp $
| |
| > <?php // $Id: attempt.php,v 1.131.2.4 2007/11/07 12:35:09 tjhunt Exp $
| |
| < * @version $Id: attempt.php,v 1.131.2.3 2007/11/02 16:20:06 tjhunt Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/quiz/jstimer.php /cvsroot/moodle/moodle/mod/quiz/jstimer.php]
| |
| < <?php // $Id: jstimer.php,v 1.16 2007/09/26 18:15:32 tjhunt Exp $
| |
| > <?php // $Id: jstimer.php,v 1.16.2.1 2007/11/02 16:19:56 tjhunt Exp $
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 159: |
Line 8: |
| Run the following commandline at the top level of your CVS sandbox: | | Run the following commandline at the top level of your CVS sandbox: |
|
| |
|
| cvs diff -r MOODLE_18_MERGED -r MOODLE_18_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] \/\/ \$Id)' > unmergedfiles.txt; cat unmergedfiles.txt | | 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== | | ==Some useful links== |
| Line 166: |
Line 15: |
| * [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums. | | * [http://moodle.org/mod/forum/discuss.php?d=43267 Review Unmerged files, please...] discussion from moodle.org forums. |
|
| |
|
| * [http://tracker.moodle.org/browse/MDL-8912 Tracker Task MDL-8912]: Progress in the Moodle Tracker about these unmerged files. | | * Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files. |
|
| |
|
| [[Category:Developer|Unmerged files]] | | [[Category:Developer|Unmerged files]] |
