Development:Unmerged files

Files with MOODLE_17_MERGED tag not updated - Mon May 12 04:39:15 CEST 2008

RCS file: /cvsroot/moodle/question/format/xml/format.php
< <?php // $Id: format.php,v 1.16.2.10 2007/09/24 14:16:58 tjhunt Exp $ 
> <?php // $Id: format.php,v 1.16.2.11 2008/05/07 12:31:50 tjhunt Exp $

Files with MOODLE_18_MERGED tag not updated - Mon May 12 04:38:49 CEST 2008

RCS file: /cvsroot/moodle/mod/resource/version.php
< <?php // $Id: version.php,v 1.35 2007/02/02 13:02:30 moodler Exp $ 
> <?php // $Id: version.php,v 1.35.2.1 2008/05/02 08:13:49 scyrma Exp $ 
 
RCS file: /cvsroot/moodle/search/querylib.php
 
RCS file: /cvsroot/moodle/search/documents/physical_pdf.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.php

Files with MOODLE_19_MERGED tag not updated - Mon May 12 04:39:01 CEST 2008

RCS file: /cvsroot/moodle/tags
 
RCS file: /cvsroot/moodle/mnet/lib.php
< <?php // $Id: lib.php,v 1.16.2.3 2008/04/30 14:36:42 thepurpleblob Exp $ 
> <?php // $Id: lib.php,v 1.16.2.4 2008/05/05 08:19:50 thepurpleblob Exp $ 
 
RCS file: /cvsroot/moodle/mnet/peer.php
< <?php // $Id: peer.php,v 1.9.2.1 2008/04/30 14:36:42 thepurpleblob Exp $ 
> <?php // $Id: peer.php,v 1.9.2.2 2008/05/05 08:19:50 thepurpleblob Exp $ 
 
RCS file: /cvsroot/moodle/search/querylib.php
 
RCS file: /cvsroot/moodle/search/documents/physical_xml.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

• Moodle CVS for developers: explains how to work with the Moodle code in CVS.
• Review Unmerged files, please... discussion from moodle.org forums.

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