OK, so how do I copy some changes I made to the trunk to the beta?
Changes I made to the trunk in r2727 need to also go into the branch. More
specifically, Makefile.am was modified, update-rpms-1.1.11-17.noarch.rpm was
deleted, and update-rpms-1.1.14-20.noarch.rpm was added.
I tried this, which doesn't appear to have done anything:
oscar-4.0b$ svn merge -r 2727:2728 ../oscar
oscar-4.0b$ svn status -u
Status against revision: 2728
oscar-4.0b$ cd ../oscar
oscar$ svn status -u
Status against revision: 2728
oscar$ ls share/prereqs/update-rpms/RPMS/ \
../oscar-4.0b/share/prereqs/update-rpms/RPMS/
../oscar-4.0b/share/prereqs/update-rpms/RPMS/:
Makefile.am update-rpms-1.1.11-17.noarch.rpm
share/prereqs/update-rpms/RPMS/:
Makefile Makefile.am Makefile.in update-rpms-1.1.14-20.noarch.rpm
oscar$
--
David N. Lombard
Rossmoor, Orange County, CA
N 33 deg, 48', W 118 deg, 5'
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_idU88&alloc_id065&op=click
_______________________________________________
Oscar-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/oscar-devel
