Development:Unmerged files: Difference between revisions

Revision as of 16:01, 19 October 2007

Files with MOODLE_17_MERGED tag not updated - Fri Oct 19 17:45:28 CEST 2007

RCS file: /cvsroot/moodle/moodle/mod/resource/type/ims/finder.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/ewiki.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/init.php
 
RCS file: /cvsroot/moodle/moodle/mod/wiki/ewiki/plugins/spages.php
 
RCS file: /cvsroot/moodle/moodle/question/format/blackboard_6/format.php

Files with MOODLE_18_MERGED tag not updated - Fri Oct 19 17:45:54 CEST 2007

RCS file: /cvsroot/moodle/moodle/admin/blocks.php
 
RCS file: /cvsroot/moodle/moodle/admin/mnet/peers.html
 
RCS file: /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.14 2007/10/16 08:50:41 donal72 Exp $ 
 
RCS file: /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.11 2007/10/19 07:52:17 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/config.html
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php
 
RCS file: /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: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php

Files with MOODLE_19_MERGED tag not updated - Fri Oct 19 17:49:20 CEST 2007

RCS file: /cvsroot/moodle/moodle/admin/mnet/peers.html
 
RCS file: /cvsroot/moodle/moodle/auth/mnet/auth.php
 
RCS file: /cvsroot/moodle/moodle/enrol/mnet/config.html
 
RCS file: /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: /cvsroot/moodle/moodle/lang/en_utf8/enrol_mnet.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/group.php
 
RCS file: /cvsroot/moodle/moodle/lang/en_utf8/mnet.php
 
RCS file: /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: /cvsroot/moodle/moodle/mnet/xmlrpc/client.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/server.php
 
RCS file: /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php
 
RCS file: /cvsroot/moodle/moodle/mod/chat/lib.php
< <?php  // $Id: lib.php,v 1.99.2.1 2007/10/17 07:18:14 toyomoyo Exp $ 
> <?php  // $Id: lib.php,v 1.99.2.2 2007/10/17 07:28:44 toyomoyo Exp $ 
 
RCS file: /cvsroot/moodle/moodle/mod/forum/lib.php

To generate this information yourself

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

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 [https://tracker.moodle.org/browse/MDL-8912 MDL-8912]: Progress in the Moodle Tracker about these unmerged files.

@@ Line 42: / Line 42: @@
   RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mnet/xmlrpc/xmlparser.php /cvsroot/moodle/moodle/mnet/xmlrpc/xmlparser.php]
-==Files with MOODLE_19_MERGED tag not updated - Thu Oct 18 19:04:47 CEST 2007 ==
+==Files with MOODLE_19_MERGED tag not updated - Fri Oct 19 17:49:20 CEST 2007 ==
   RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/admin/mnet/peers.html /cvsroot/moodle/moodle/admin/mnet/peers.html]
@@ Line 59: / Line 59: @@
   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/weblib.php /cvsroot/moodle/moodle/lib/weblib.php]
- < <?php // $Id: weblib.php,v 1.970.2.7 2007/10/15 10:06:47 nfreear Exp $
- > <?php // $Id: weblib.php,v 1.970.2.8 2007/10/17 20:20:17 tjhunt Exp $
- <  * @version  $Id: weblib.php,v 1.970.2.7 2007/10/15 10:06:47 nfreear Exp $
- >  * @version  $Id: weblib.php,v 1.970.2.8 2007/10/17 20:20:17 tjhunt Exp $
   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.1 2007/10/17 08:11:50 donal72 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]
@@ Line 81: / Line 75: @@
   RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/mod/forum/lib.php /cvsroot/moodle/moodle/mod/forum/lib.php]
- RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/styles_ie6.css /cvsroot/moodle/moodle/theme/custom_corners/styles_ie6.css]
- RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/user_styles.css /cvsroot/moodle/moodle/theme/custom_corners/user_styles.css]
- RCS file: [http://moodle.cvs.sourceforge.net/moodle/moodle/theme/custom_corners/js/jquery.php /cvsroot/moodle/moodle/theme/custom_corners/js/jquery.php]
 ==To generate this information yourself==

Documentation

Development:Unmerged files: Difference between revisions

Revision as of 16:01, 19 October 2007

Contents

Files with MOODLE_17_MERGED tag not updated - Fri Oct 19 17:45:28 CEST 2007

Files with MOODLE_18_MERGED tag not updated - Fri Oct 19 17:45:54 CEST 2007

Files with MOODLE_19_MERGED tag not updated - Fri Oct 19 17:49:20 CEST 2007

To generate this information yourself

Some useful links