Note: You are currently viewing documentation for Moodle 3.7. Up-to-date documentation for the latest stable version of Moodle may be available here: Unmerged files.

Development:Unmerged files: Difference between revisions

From MoodleDocs
No edit summary
 
(517 intermediate revisions by 7 users not shown)
Line 1: Line 1:
==Files with MOODLE_15_MERGED tag not updated - Tue May 16 20:08:21 CEST 2006 ==
__NOEDITSECTION__
 
==Unmerged Files Report==
RCS file: /cvsroot/moodle/moodle/grade/lib.php,v
< <?php // $Id: lib.php,v 1.16.2.13 2006/02/13 01:36:26 toyomoyo Exp $
> <?php // $Id: lib.php,v 1.16.2.14 2006/05/16 04:07:47 vyshane Exp $
 
RCS file: /cvsroot/moodle/moodle/lib/editor/Attic/htmlarea.php,v
< // $Id: htmlarea.php,v 1.60.2.9 2006/01/25 23:41:11 julmis Exp $
> // $Id: htmlarea.php,v 1.60.2.10 2006/05/14 09:22:24 urs_hunkler Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/quiz/lib.php,v
< <?php  // $Id: lib.php,v 1.217.2.6 2006/03/07 23:44:01 skodak Exp $
> <?php  // $Id: lib.php,v 1.217.2.7 2006/05/13 17:28:28 gustav_delius Exp $
< * @version $Id: lib.php,v 1.217.2.6 2006/03/07 23:44:01 skodak Exp $
> * @version $Id: lib.php,v 1.217.2.7 2006/05/13 17:28:28 gustav_delius Exp $


==Files with MOODLE_16_MERGED tag not updated - Tue May 16 20:09:46 CEST 2006 ==
__UNMERGED_FILES_REPORT__
 
 
RCS file: /cvsroot/moodle/moodle/auth/shibboleth/config.html,v
==To generate this information yourself==
 
 
  RCS file: /cvsroot/moodle/moodle/grade/lib.php,v
Run the following commandline at the top level of your CVS sandbox:
< <?php // $Id: lib.php,v 1.31.2.1 2006/05/15 02:25:42 toyomoyo Exp $
 
> <?php // $Id: lib.php,v 1.31.2.3 2006/05/16 06:57:08 vyshane Exp $
  cvs diff -kkv -r MOODLE_19_MERGED -r MOODLE_19_STABLE | egrep '^(RCS|[<>] <\?[Pp][Hh][Pp] *\/\/ *\$Id)' > unmergedfiles.txt; cat unmergedfiles.txt
 
RCS file: /cvsroot/moodle/moodle/mod/choice/view.php,v
< <?php  // $Id: view.php,v 1.83 2006/05/15 23:24:42 danmarsden Exp $
> <?php  // $Id: view.php,v 1.82.2.1 2006/05/15 23:21:39 danmarsden Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/hotpot/README.TXT,v
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/lesson.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/locallib.php,v
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/view.php,v
< <?PHP  // $Id: view.php,v 1.91 2006/05/02 17:05:29 mark-nielsen Exp $
> <?PHP  // $Id: view.php,v 1.91.2.1 2006/05/15 19:05:58 mark-nielsen Exp $
 
RCS file: /cvsroot/moodle/moodle/mod/lesson/action/continue.php,v
< <?php // $Id: continue.php,v 1.19 2006/03/25 21:38:57 mark-nielsen Exp $
> <?php // $Id: continue.php,v 1.19.2.1 2006/05/16 03:04:44 mark-nielsen Exp $


==Some useful links==
==Some useful links==


* [[:en:CVS (developer)|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS.
* [[:en:Development:CVS for developers|Moodle CVS for developers]]: explains how to work with the Moodle code in CVS.
* [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.


[[Category:Developer]]
* Tracker Task MDL-8912: Progress in the Moodle Tracker about these 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.