|
|
| (281 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 - Wed Oct 10 16:06:51 CEST 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/grade/lib.php /cvsroot/moodle/moodle/grade/lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/moodle.php /cvsroot/moodle/moodle/lang/en_utf8/moodle.php]
| |
| < <?PHP // $Id: moodle.php,v 1.65.2.15 2007/03/30 02:27:27 toyomoyo Exp $
| |
| > <?PHP // $Id: moodle.php,v 1.65.2.16 2007/10/03 00:02:37 whchuang Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/scorm.php /cvsroot/moodle/moodle/lang/en_utf8/scorm.php]
| |
| < <?PHP // $Id: scorm.php,v 1.9.2.2 2007/03/13 08:47:52 moodler Exp $
| |
| > <?PHP // $Id: scorm.php,v 1.9.2.3 2007/07/03 08:05:57 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/accesslib.php /cvsroot/moodle/moodle/lib/accesslib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/lib.php /cvsroot/moodle/moodle/mod/scorm/lib.php]
| |
| < <?php // $Id: lib.php,v 1.76.2.2 2007/03/29 08:18:35 csantossaenz Exp $
| |
| > <?php // $Id: lib.php,v 1.76.2.3 2007/07/03 14:11:20 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_12lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php /cvsroot/moodle/moodle/mod/scorm/datamodels/scorm_13lib.php]
| |
| | |
| ==Files with MOODLE_18_MERGED tag not updated - Sat Oct 6 21:29:51 CEST 2007 ==
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/auth.php /cvsroot/moodle/moodle/auth/cas/auth.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/filter/tex/texdebug.php /cvsroot/moodle/moodle/filter/tex/texdebug.php]
| |
| < <?PHP // $Id: texdebug.php,v 1.16.2.3 2007/09/11 13:53:24 thepurpleblob Exp $
| |
| > <?PHP // $Id: texdebug.php,v 1.16.2.4 2007/09/11 14:52:51 thepurpleblob Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/admin.php /cvsroot/moodle/moodle/lang/en_utf8/admin.php]
| |
| < <?PHP // $Id: admin.php,v 1.103.2.15 2007/08/22 05:56:10 jamiesensei Exp $
| |
| > <?PHP // $Id: admin.php,v 1.103.2.16 2007/10/04 18:29:13 whchuang Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lang/en_utf8/moodle.php /cvsroot/moodle/moodle/lang/en_utf8/moodle.php]
| |
| < <?PHP // $Id: moodle.php,v 1.105.2.15 2007/09/16 08:28:55 stronk7 Exp $
| |
| > <?PHP // $Id: moodle.php,v 1.105.2.16 2007/10/03 00:04:04 whchuang Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/lib.php /cvsroot/moodle/moodle/mnet/lib.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/mod/assignment/lib.php /cvsroot/moodle/moodle/mod/assignment/lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/chat/view.php /cvsroot/moodle/moodle/mod/chat/view.php]
| |
| < <?php // $Id: view.php,v 1.55.2.5 2007/08/09 13:28:15 moodler Exp $
| |
| > <?php // $Id: view.php,v 1.55.2.6 2007/09/20 09:45:29 urs_hunkler Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/forum/lib.php /cvsroot/moodle/moodle/mod/forum/lib.php]
| |
| < <?php // $Id: lib.php,v 1.536.2.36 2007/08/13 05:38:14 toyomoyo Exp $
| |
| > <?php // $Id: lib.php,v 1.536.2.38 2007/09/24 06:32:22 samulik Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/journal/lib.php /cvsroot/moodle/moodle/mod/journal/lib.php]
| |
| < <?php // $Id: lib.php,v 1.79.2.1 2007/05/15 18:26:53 skodak Exp $
| |
| > <?php // $Id: lib.php,v 1.79.2.2 2007/09/24 06:32:27 samulik Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/lams/lib.php /cvsroot/moodle/moodle/mod/lams/lib.php]
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/locallib.php /cvsroot/moodle/moodle/mod/scorm/locallib.php]
| |
| < <?php // $Id: locallib.php,v 1.34.2.7 2007/06/06 22:16:38 bobopinna Exp $
| |
| > <?php // $Id: locallib.php,v 1.34.2.8 2007/09/13 10:26:58 bobopinna Exp $
| |
|
| |
| RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/my/index.php /cvsroot/moodle/moodle/my/index.php]
| |
| < <?php // $Id: index.php,v 1.11.2.2 2007/07/23 15:50:59 stronk7 Exp $
| |
| > <?php // $Id: index.php,v 1.11.2.3 2007/09/20 09:32:59 urs_hunkler Exp $
| |
|
| |
|
| ==To generate this information yourself== | | ==To generate this information yourself== |
| Line 72: |
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 79: |
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]] |
