Off the top of my head:
- IIRC, some of the LAM doc changes on the branch were about workarounds for the fixes that are now on the trunk. I'll double check and, and if it's as I remember, I'll change your classification to MERGE instead of COPY TO TRUNK and commit those shortly (i.e., the workarounds are not necessary on the trunk).
- Not entirely sure about the disable-services / mta-config changes -- I know DongInn is in the middle of working on making the MTA configuration stuff a separate package on the trunk. I didn't look file-by-file at your analysis, but it probably reflects the Right Things To Do (I'll let DongInn comment there).
- The doc/*/*tex files are marked COPY TO TRUNK -- let's double check that they reflect what we want the trunk docs to say (i.e., that they don't have comments in there about workarounds that we intend to fix on the trunk). You may have checked this already...?
On Jan 3, 2005, at 2:38 AM, David N. Lombard wrote:
Key: COPY TO TRUNK: the beta branch is the right one OK: the trunk is the right one. IGNORE: a file only in the beta branch will be ignored MERGE: merge the two copies. DELETE: a file to be deleted from the trunk ADD TO TRUNK: a file to be added to the trunk
Files oscar/dist/make-dist.sh and oscar-4.0b/dist/make-dist.sh differ
-COPY TO TRUNK
Files oscar/dist/VERSION and oscar-4.0b/dist/VERSION differ
-OK
Files oscar/doc/installation/release-notes.tex and oscar-4.0b/doc/installation/release-notes.tex differ
-COPY TO TRUNK
Files oscar/doc/installation/supported.tex and oscar-4.0b/doc/installation/supported.tex differ
-COPY TO TRUNK
Files oscar/lib/OSCAR/DelNode.pm and oscar-4.0b/lib/OSCAR/DelNode.pm differ
-COPY TO TRUNK
Files oscar/lib/OSCAR/Distro.pm and oscar-4.0b/lib/OSCAR/Distro.pm differ
-MERGE
Files oscar/lib/OSCAR/MAC.pm and oscar-4.0b/lib/OSCAR/MAC.pm differ
-OK
Files oscar/lib/OSCAR/Package.pm and oscar-4.0b/lib/OSCAR/Package.pm differ
-OK
Files oscar/lib/Qt/OpderDownloadPackage.pm and oscar-4.0b/lib/Qt/OpderDownloadPackage.pm differ
-OK
Files oscar/lib/Qt/SelectorTable.pm and oscar-4.0b/lib/Qt/SelectorTable.pm differ
-OK
Files oscar/Makefile.am and oscar-4.0b/Makefile.am differ
-COPY TO TRUNK
Files oscar/oscarsamples/Makefile.am and oscar-4.0b/oscarsamples/Makefile.am differ
-COPY TO TRUNK
Only in oscar/oscarsamples: mandrake-10.0-i386.rpmlist
-DELETE
Files oscar/oscarsamples/redhat-3as-i386.rpmlist and oscar-4.0b/oscarsamples/redhat-3as-i386.rpmlist differ
-COPY TO TRUNK
Files oscar/oscarsamples/redhat-3as-ia64.rpmlist and oscar-4.0b/oscarsamples/redhat-3as-ia64.rpmlist differ
-COPY TO TRUNK
Only in oscar-4.0b/oscarsamples: redhat-3asU2-i386.rpmlist
-COPY TO TRUNK
Only in oscar-4.0b/oscarsamples: redhat-3asU2-ia64.rpmlist
-COPY TO TRUNK
Files oscar/packages/disable-services/config.xml and oscar-4.0b/packages/disable-services/config.xml differ
-COPY TO TRUNK
Only in oscar-4.0b/packages/disable-services/scripts: disable.client.incoming-mail
-COPY TO TRUNK
Only in oscar-4.0b/packages/disable-services/scripts: distro_control
-COPY TO TRUNK
Only in oscar-4.0b/packages/disable-services/scripts: enable.client.mail-locally
-COPY TO TRUNK
Only in oscar-4.0b/packages/disable-services/scripts: install_postfix
-COPY TO TRUNK
Only in oscar-4.0b/packages/disable-services/scripts: post_install
-COPY TO TRUNK
Only in oscar-4.0b/packages/disable-services/scripts: post_server_rpm_install
-COPY TO TRUNK
Files oscar/packages/disable-services/scripts/setup and oscar-4.0b/packages/disable-services/scripts/setup differ
-OK
Only in oscar-4.0b/packages/ganglia/SRPMS: ganglia-monitor-core-2.5.6-1.src.rpm
-ADD TO TRUNK
Only in oscar-4.0b/packages/ganglia/SRPMS: rrdtool-1.0.45-1.fr.src.rpm
-ADD TO TRUNK
Only in oscar-4.0b/packages/lam/distro/fedora: lam-switcher-modulefile-7.0.6-1.i386.rpm
-IGNORE
Only in oscar-4.0b/packages/lam/distro/mdk10: lam-switcher-modulefile-7.0.6-1.i586.rpm
-IGNORE
Only in oscar-4.0b/packages/lam/distro/rh90: lam-switcher-modulefile-7.0.6-1.i386.rpm
-IGNORE
Only in oscar-4.0b/packages/lam/distro/rh90: lam-switcher-modulefile-7.0.6-1.ia64.rpm
-IGNORE
Files oscar/packages/lam/doc/license.tex and oscar-4.0b/packages/lam/doc/license.tex differ
-COPY TO TRUNK
Files oscar/packages/lam/doc/user.tex and oscar-4.0b/packages/lam/doc/user.tex differ
-COPY TO TRUNK
Only in oscar/packages/lam/RPMS: lam-switcher-modulefile-7.0.6-2.noarch.rpm
-OK
Only in oscar-4.0b/packages/lam/SRPMS: lam-switcher-modulefile-7.0.6-1.src.rpm
-OK
Only in oscar/packages/lam/SRPMS: lam-switcher-modulefile-7.0.6-2.src.rpm
-OK
Only in oscar/packages: mta-config
-OK
Files oscar/packages/opium/doc/install.tex and oscar-4.0b/packages/opium/doc/install.tex differ
-COPY TO TRUNK
Files oscar/packages/pbs/config.xml and oscar-4.0b/packages/pbs/config.xml differ
-COPY TO TRUNK
Only in oscar-4.0b/packages/pbs/RPMS: openpbs-oscar-2.3.16-11.i386.rpm
-IGNORE
Only in oscar/packages/pbs/RPMS: openpbs-oscar-2.3.16-12.i386.rpm
-OK
Only in oscar-4.0b/packages/pbs/RPMS: openpbs-oscar-client-2.3.16-11.i386.rpm
-IGNORE
Only in oscar/packages/pbs/RPMS: openpbs-oscar-client-2.3.16-12.i386.rpm
-OK
Only in oscar-4.0b/packages/pbs/RPMS: openpbs-oscar-gui-2.3.16-11.i386.rpm
-IGNORE
Only in oscar/packages/pbs/RPMS: openpbs-oscar-gui-2.3.16-12.i386.rpm
-OK
Only in oscar-4.0b/packages/pbs/RPMS: openpbs-oscar-mom-2.3.16-11.i386.rpm
-IGNORE
Only in oscar/packages/pbs/RPMS: openpbs-oscar-mom-2.3.16-12.i386.rpm
-OK
Only in oscar-4.0b/packages/pbs/RPMS: openpbs-oscar-server-2.3.16-11.i386.rpm
-IGNORE
Only in oscar/packages/pbs/RPMS: openpbs-oscar-server-2.3.16-12.i386.rpm
-OK
Only in oscar-4.0b/packages/pbs/SRPMS: openpbs-oscar-2.3.16-11.src.rpm
-IGNORE
Only in oscar/packages/pbs/SRPMS: openpbs-oscar-2.3.16-12.src.rpm
-OK
Only in oscar-4.0b/packages/pvm/distro/rh3as: pvm-3.4.4+11-3.ia64.rpm
-COPY TO TRUNK
Only in oscar-4.0b/packages/pvm/distro/rh3as: pvm-modules-oscar-3.4.4+11-3.ia64.rpm
-COPY TO TRUNK
Files oscar/packages/sis/config.xml and oscar-4.0b/packages/sis/config.xml differ
-COPY TO TRUNK
Files oscar/packages/sis/scripts/post_clients and oscar-4.0b/packages/sis/scripts/post_clients differ
-COPY TO TRUNK
Files oscar/packages/sis/scripts/systeminstaller-1.04.patch and oscar-4.0b/packages/sis/scripts/systeminstaller-1.04.patch differ
-COPY TO TRUNK
Only in oscar-4.0b/packages/sis/SRPMS: syslinux-2.11-1oscar.ia64.rpm
-COPY TO TRUNK
Only in oscar-4.0b/packages/sis/SRPMS: tftp-hpa-0.32-2.src.rpm
-COPY TO TRUNK
Files oscar/packages/switcher/scripts/pre_configure and oscar-4.0b/packages/switcher/scripts/pre_configure differ
-OK
Only in oscar: README.RH3AS.IA64.txt
-DELETE
Only in oscar-4.0b/: README.RH3AS.txt
-ADD TO TRUNK
Files oscar/scripts/ping_clients and oscar-4.0b/scripts/ping_clients differ
-COPY TO TRUNK
Files oscar/scripts/post_install and oscar-4.0b/scripts/post_install differ
-COPY TO TRUNK
Files oscar/scripts/set_global_oscar_values and oscar-4.0b/scripts/set_global_oscar_values differ
-OK
Files oscar/scripts/setup_pxe and oscar-4.0b/scripts/setup_pxe differ
-copy ot trunk
Files oscar/scripts/start_over and oscar-4.0b/scripts/start_over differ
-OK
Files oscar/scripts/wizard_prep and oscar-4.0b/scripts/wizard_prep differ
-OK
Files oscar/share/prereqs/perl-Tk/media/RPMS/5.6/Makefile.am and oscar-4.0b/share/prereqs/perl-Tk/media/RPMS/5.6/Makefile.am differ
-COPY TO TRUNK
Only in oscar-4.0b/share/prereqs/perl-Tk/media/RPMS/5.6: perl-Tk-800.024-3.ia64.rpm
-ADD TO TRUNK
Files oscar/testing/test_cluster and oscar-4.0b/testing/test_cluster differ
-COPY TO TRUNK
-- {+} Jeff Squyres {+} [EMAIL PROTECTED] {+} http://www.lam-mpi.org/
------------------------------------------------------- The SF.Net email is sponsored by: Beat the post-holiday blues Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek. It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt _______________________________________________ Oscar-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/oscar-devel
