Hi, As we figured, merging back 1.2.x to trunk is a pia, and we have 77 conflicting files. To make this tractable, I'd like to propose we handle the merges on a module by module basis, and that each module is assigned to an individual to merge over into trunk. Below are a list of modules and folks I'd like to suggest do the merge, bark back if you are unwilling!
(want to know how many files there are in each module? just jump to the root of your trunk working directory and run svn merge --dry-run https://opencast.jira.com/svn/MH/branches/1.2.x https://opencast.jira.com/svn/MH/trunk ) matjaz: docs/scripts akm: modules/matterhorn-capture-admin-service-impl akm: modules/matterhorn-capture-agent-impl twunden: modules/matterhorn-oaipmh twunden: modules/matterhorn-series-service-impl/ micah: modules/matterhorn-ingest-service-impl micah: modules/matterhorn-static micah: modules/matterhorn-search-service-impl micah: shared-resources/ susana: modules/matterhorn-admin-ui jholtzman: modules/matterhorn-test-harness jholtzman: modules/matterhorn-userdirectory-ldap jholtzman: modules/matterhorn-kernel jholtzman: docs/felix jholtzman: modules/matterhorn-conductor jholtzman: modules/matterhorn-common jholtzman: modules/matterhorn-workflow-service-impl jholtzman: . Feel free to trade them like pokemon if you need to! The faster we clean this up, the faster we can move onto 1.2.1, where the process will be more clearly laid out to avoid this issue. I'm aiming for THURSDAY SEPTEMBER 15th (one week) as a deadline... Chris -- Christopher Brooks, BSc, MSc ARIES Laboratory, University of Saskatchewan Web: http://www.cs.usask.ca/~cab938 Phone: 1.306.966.1442 Mail: Advanced Research in Intelligent Educational Systems Laboratory Department of Computer Science University of Saskatchewan 176 Thorvaldson Building 110 Science Place Saskatoon, SK S7N 5C9 _______________________________________________ Matterhorn mailing list [email protected] http://lists.opencastproject.org/mailman/listinfo/matterhorn To unsubscribe please email [email protected] _______________________________________________
