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

Development:Unmerged files: Difference between revisions

From MoodleDocs
No edit summary
 
(267 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 - Fri Oct 12 11:09:36 CEST 2007 ==
 
==Files with MOODLE_18_MERGED tag not updated - Fri Oct 12 11:09:22 CEST 2007 ==
 
==Files with MOODLE_19_MERGED tag not updated - Fri Oct 12 11:38:12 CEST 2007 ==
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/simpletestlib.php /cvsroot/moodle/moodle/lib/simpletestlib.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/header.html /cvsroot/moodle/moodle/theme/custom_corners/header.html]
 
 
 
== MOODLE 18 - MDL-11632 ==
 
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/uploaduser.php /cvsroot/moodle/moodle/admin/uploaduser.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/auth/cas/languages.php /cvsroot/moodle/moodle/auth/cas/languages.php]
< // version $Id: languages.php,v 1.2.20.5 2007/07/17 11:55:09 jgutierr25 Exp $
> // version $Id: languages.php,v 1.2.20.6 2007/10/10 21:09:22 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/search.php /cvsroot/moodle/moodle/course/search.php]
< <?php // $Id: search.php,v 1.35.2.9 2007/03/02 01:24:47 nicolasconnault Exp $
> <?php // $Id: search.php,v 1.35.2.10 2007/10/10 21:09:23 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/user.php /cvsroot/moodle/moodle/course/user.php]
< <?php // $Id: user.php,v 1.66.2.4 2007/10/07 09:15:37 moodler Exp $
> <?php // $Id: user.php,v 1.66.2.5 2007/10/10 21:09:23 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/course/import/groups/index.php /cvsroot/moodle/moodle/course/import/groups/index.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/weblib.php /cvsroot/moodle/moodle/lib/weblib.php]
< <?php // $Id: weblib.php,v 1.812.2.86 2007/10/05 07:18:11 toyomoyo Exp $
> <?php // $Id: weblib.php,v 1.812.2.87 2007/10/10 16:05:18 jmg324 Exp $
<  * @version  $Id: weblib.php,v 1.812.2.86 2007/10/05 07:18:11 toyomoyo Exp $
>  * @version  $Id: weblib.php,v 1.812.2.87 2007/10/10 16:05:18 jmg324 Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/readme_moodle.txt /cvsroot/moodle/moodle/lib/adodb/readme_moodle.txt]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-ar.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-ar.inc.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-bg.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-bg.inc.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-bgutf8.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-bgutf8.inc.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-en.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-en.inc.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-pl.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-pl.inc.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/lib/adodb/lang/adodb-ro.inc.php /cvsroot/moodle/moodle/lib/adodb/lang/adodb-ro.inc.php]
 
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/mod/choice/index.php /cvsroot/moodle/moodle/mod/choice/index.php]
< <?php  // $Id: index.php,v 1.27 2006/09/02 11:44:04 skodak Exp $
> <?php  // $Id: index.php,v 1.27.6.1 2007/10/10 21:09:26 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/exercise/assessments.php /cvsroot/moodle/moodle/mod/exercise/assessments.php]
< <?php  // $Id: assessments.php,v 1.35 2007/01/06 19:23:05 skodak Exp $
> <?php  // $Id: assessments.php,v 1.35.2.1 2007/10/10 21:09:26 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/glossary/tabs.php /cvsroot/moodle/moodle/mod/glossary/tabs.php]
< <?php  // $Id: tabs.php,v 1.1.2.5 2007/03/30 00:24:54 stronk7 Exp $
> <?php  // $Id: tabs.php,v 1.1.2.6 2007/10/10 21:09:28 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/journal/index.php /cvsroot/moodle/moodle/mod/journal/index.php]
< <?php // $Id: index.php,v 1.21 2006/04/05 07:46:53 gustav_delius Exp $
> <?php // $Id: index.php,v 1.21.12.1 2007/10/10 21:09:28 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/journal/report.php /cvsroot/moodle/moodle/mod/journal/report.php]
< <?php // $Id: report.php,v 1.34.6.1 2007/05/15 18:26:50 skodak Exp $
> <?php // $Id: report.php,v 1.34.6.2 2007/10/10 21:09:28 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/label/view.php /cvsroot/moodle/moodle/mod/label/view.php]
< <?php  // $Id: view.php,v 1.4 2006/08/08 22:10:00 skodak Exp $
> <?php  // $Id: view.php,v 1.4.8.1 2007/10/10 21:09:29 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/lesson/action/confirmdelete.php /cvsroot/moodle/moodle/mod/lesson/action/confirmdelete.php]
< <?php // $Id: confirmdelete.php,v 1.5 2006/09/30 19:49:41 mark-nielsen Exp $
> <?php // $Id: confirmdelete.php,v 1.5.6.1 2007/10/10 21:09:29 iarenaza Exp $
<  * @version $Id: confirmdelete.php,v 1.5 2006/09/30 19:49:41 mark-nielsen Exp $
>  * @version $Id: confirmdelete.php,v 1.5.6.1 2007/10/10 21:09:29 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/index.php /cvsroot/moodle/moodle/mod/resource/index.php]
< <?php // $Id: index.php,v 1.20.2.1 2007/02/28 05:36:18 nicolasconnault Exp $
> <?php // $Id: index.php,v 1.20.2.2 2007/10/10 21:09:29 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/resource/type/repository/hive/openlitepublish.php /cvsroot/moodle/moodle/mod/resource/type/repository/hive/openlitepublish.php]
< <?php // $Id: openlitepublish.php,v 1.2 2006/09/22 13:27:56 moodler Exp $
> <?php // $Id: openlitepublish.php,v 1.2.6.1 2007/10/10 21:09:30 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/scorm/datamodel.php /cvsroot/moodle/moodle/mod/scorm/datamodel.php]
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/survey/download.php /cvsroot/moodle/moodle/mod/survey/download.php]
< <?php // $Id: download.php,v 1.24 2006/12/21 19:46:29 skodak Exp $
> <?php // $Id: download.php,v 1.24.2.1 2007/10/10 21:09:31 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/assess.php /cvsroot/moodle/moodle/mod/workshop/assess.php]
< <?php  // $Id: assess.php,v 1.14.2.1 2007/02/28 05:36:36 nicolasconnault Exp $
> <?php  // $Id: assess.php,v 1.14.2.2 2007/10/10 21:09:32 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/assessments.php /cvsroot/moodle/moodle/mod/workshop/assessments.php]
< <?php  // $Id: assessments.php,v 1.57 2007/01/10 08:29:42 toyomoyo Exp $
> <?php  // $Id: assessments.php,v 1.57.2.1 2007/10/10 21:09:32 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/upload.php /cvsroot/moodle/moodle/mod/workshop/upload.php]
< <?php  // $Id: upload.php,v 1.27 2006/09/22 03:28:56 vyshane Exp $
> <?php  // $Id: upload.php,v 1.27.6.1 2007/10/10 21:09:33 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/workshop/viewassessment.php /cvsroot/moodle/moodle/mod/workshop/viewassessment.php]
< <?php  // $Id: viewassessment.php,v 1.13 2007/01/10 08:29:42 toyomoyo Exp $
> <?php  // $Id: viewassessment.php,v 1.13.2.1 2007/10/10 21:09:33 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/export.php /cvsroot/moodle/moodle/question/export.php]
< <?php // $Id: export.php,v 1.28.2.5 2007/09/19 17:57:52 tjhunt Exp $
> <?php // $Id: export.php,v 1.28.2.6 2007/10/10 21:09:34 iarenaza Exp $
< * @version $Id: export.php,v 1.28.2.5 2007/09/19 17:57:52 tjhunt Exp $
> * @version $Id: export.php,v 1.28.2.6 2007/10/10 21:09:34 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/question/format/blackboard/format.php /cvsroot/moodle/moodle/question/format/blackboard/format.php]
< <?php // $Id: format.php,v 1.8.2.1 2007/03/14 15:14:14 thepurpleblob Exp $
> <?php // $Id: format.php,v 1.8.2.2 2007/10/10 21:09:35 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/sso/hive/login.php /cvsroot/moodle/moodle/sso/hive/login.php]
< <?php  // $Id: login.php,v 1.3 2006/09/20 19:46:53 skodak Exp $
> <?php  // $Id: login.php,v 1.3.6.1 2007/10/10 21:09:35 iarenaza Exp $
 
RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/chameleon/ui/chameleon.php /cvsroot/moodle/moodle/theme/chameleon/ui/chameleon.php]


==To generate this information yourself==
==To generate this information yourself==
Line 134: 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 141: 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]]

Latest revision as of 15:49, 8 January 2009

Unmerged Files Report

__UNMERGED_FILES_REPORT__

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

  • Tracker Task MDL-8912: Progress in the Moodle Tracker about these unmerged files.
Retrieved from "https://docs.moodle.org/23/en/index.php?title=Development:Unmerged_files&oldid=48694"
Powered by MediaWiki