Hi Markus, Here's a list of tickets (bottom of this email), but I don't think this is the ideal way to merge. Mostly because I can't:
a) tell you which component the ticket was against easily b) tell you which modules the ticket addressed c) after the merge it might still show up as a conflict unless you clear the merge information, and for that you need (b) SVN keeps merge history on files, but we track changes on a ticket (feature) level. So, I'd prefer to do by module; comments from anyone? This should be our topic at tomorrows meeting, so everyone I fingered in the first ticket (akm, micah, susana, tobias, josh, matjaz, and markus) please attend if you can. Chris MH-7401, merged device dc:sptial change into 1.2.x branch. MH-7401, merged update change to 1.2.x MH-7803 -- patch by Christoph which fixes dc:ispartof serialization MH-7826, series autocomplete now uses new series endpoint and does label concatenation in JS MH-7826, series autocomplete now uses new series endpoint and does label concatenation in JS MH-7645 merging changes from trunk to 1.2 MH-7700 merging changes to 1.2.x branch MH-7849 -- merged fix into 1.2.x Fixing MH-7821 for 1.2.x as well MH-7047, updated susana's patch for 1.2.x, added creation time/date for upload. Fix for MH-7881 in 1.2 branch Fix for MH-7881 in 1.2 branch, forgot a file. Fix for MH-7840 in branch 1.2 MH-7844: changes for 1.2.x MH-7799: fixes for 1.2.x branch MH-7801: fixes for 1.2.x branch MH-7865: changed view/edit to read/write (1.2.x) MH-7866: Series now in alpha numeric order (1.2.x branch) MH-7875: updated alignment (1.2.x branch) MH-7789: fixes for 1.2.x branch MH-7857: fixed non definied variable (1.2.x branch) MH-7802: removed doubled point (1.2.x branch) MH-7847: changed release number on welcome page (1.2.x branch) MH-7825, upload, scheduler and hold state no longer create series. MH-7872, Deletion now removes scheduled recording and stops workflow for upcoming recordings. MH-7874, Bulk action now deletes upcoming recordings. Solved bug with Dublincore catalog cloning, fixed mediapackage temporal field for recurring events. MH-7887 -- merged LDAP performance improvements from r10608 into 1.2.x. MH-7341 : Fixed the wrong column headers. Fix by @sozores MH-7803 -- Applied patch by C. Driessen MH-7891: fixed series autocomplete(1.2.x branch) MH-7895 -- added multivalue capabilities for license and access rights MH-7894 -- Using an empty list of control entries if no acl is available Fix for MH-7878 in 1.2.x MH-7698 : Last fixes for the channel copy bug MH-7895 -- fixed multi value property on additional fields MH-7847 -- fixed home screen references to 1.1 Fix for MH-6767 and MH-7879 in branch 1.2.x MH-7853, Committing Susana's series view patch. Changed series service to provide total record count and fixed small paging issue when hitting next. MH-7873, Bulk action edit should work again. MH-7805 Added support for secure ldap and a configuration template. Courtesy of Collene Hansen. Fixing MH-7904 in 1.2.x branch MH-7901: missed changed variable (1.2.x branch) MH-7893: fixed series autocomplete to scheduler UI(1.2.x branch) MH-7900 : Fixed the bad paging issue MH-7889 -- merged authorization service fix from the trunk to the 1.2.x branch MH-7899, title now is changed with incremental numbers when bulk editing. MH-7875: fixed alignment and added 10px border at top of bulk action div MH-7341: switched order of columns MH-7876: changed label of button when selecting delete MH-7913, duration should now be correctly calculated for scheduled recordings. MH-7918 updated paging to show 1 of pageamount MH-7914 -- merged fixed series solr schema from r10656 into 1.2.x MH-7911, temporal field properly parsed into start, end and duration fields. MH-7825, reverted changes to upload, bulk edit and scheduler preventing creation of series. This is to prepare for ACL changes in MH-7919. MH-7891: fixed autocomplete MH-7893 fixed autocomplete on scheduler MH-7920: fixed hiding of recordings when uploading captions and fixed one little issue on trimming MH-7846 fix align Date generation in utils MH-7925 removed (commented out) edit column in series view MH-7919 -- merged ACL changes from the trunk into 1.2.x MH-7924 - Added a catch for another Exception that is not mentioned in the API. MH-7828, error handling for missing fields. MH-7924 - Fix for a broken build. MH-7930, series title denormalized while creating workflow so that it accessable in the recording UI. MH-7930, MH-7926, series title now populated. Selected inputs populated. MH-6207, MH-6208, scheduler submit dialog has returned, no longer able to multiple submit events. MH-7916 -- logged in users can now find anonymous recordings in search MH-7937 -- series sorting is now title by default MH-7918: fixed paging. Now it's the same as on recordings MH-7950 These instructions are wrong. Very misleading to users. MH-7334, fixed day of the week missreporting. Again. Fix for MH-7957 in branch 1.2 MH-7939, InspectOperationHandler now uses the previous scheduled start time on the mediapackage if there is no Created date in the DC catalog. MH-7935, parse conflicting events correctly MH-7935, MH-7961, MH-7962. Conflicting events should now be reported properly and prevent you from submitting if they exist. MH-7965, new series created during upload. MH-7900 added for susana. MH-7975 - Bringing across ical4j changes MH-7971 Broke the build somehow, gotta come back to this. MH-7975 Ported fixes from trunk over, now all modules share their ical versions MH-7973: back to recordings now always works MH-6928, MH-7107, MH-4246 admin fixes for 1.2 MH-7980, changed series component to reflect change in catalog serialization. MH-7989, allow ignore of 'failed to start' recordings MH-7990, play button regression fixed. Should now point to engage ui again. MH-7995 Added ignoring of the test as its not needed for 1.2 MH-8001 As per resolution on list, DDL is for indicies only. MH-8002, changed rest doc path validation regex to allow [, ], and - characters. MH-7927, hold state and captioning presevered during edit. MH-7888 seems to work now, but have a look at MH-7983. MH-7972, upload, bulk edit, and schedule screens now include a default ACL when creating a new series. MH-7835 Fixed URL for the 1.2.44 PNG library MH-7652 merging patch to 1.2.x branch MH-7652 merge failed - fixed it MH-6305 Updates to doc location to keep number of recordings per page after scheduling MH-6298 Patch from susana to warn user if they haven't uploaded a captions file MH-6707 Committing trim/review fix for susana MH-7983 Reverted player-multi-hybrid.js and player-multi-hybrid-initialize.js to an older version Committing MH-8025 to 1.2.x MH-8031 - install.sh default source was pointing to trunk instead of this branch. MH-7923 Need to have DDL scripts, JPA doesn't completely work MH-8043, fixed series creation function in upload js. Selector was not obtaining the id on series creation. MH-7983 formatted player-multi-hybrid.js. MH-7983 formatted player-multi-hybrid-initialize.js. MH-7816: fixed the annotations so that they are correctly recognized MH-7945: fixed an issue with location referrer. all docs are now available Fix for MH-8049 Fix for MH-8009 MH-8053: fixed the URL which was changed due to MH-7816 Merging MH-8026 into 1.2.x. Final fix for MH-7945. Fixing dev page as part of MH-7945 Merge of sozores' changes from MH-6876 in order to finish MH-8049 properly. MH-8016 - Added ca_metadata as a column for the SCHED_EVENT table as the data model for the application was not matching the database. MH-8057 schema file now drops the db if it exists. only run this sql file if you want the sql to be executed! MH-8009, merged agent status fix into 1.2.x. On Mon, 12 Sep 2011 21:45:39 +0200 Markus Moormann <[email protected]> wrote: > Hi Chris, > > a list of ticket numbers would be great so I can merge the admin UI > changes. > > Markus > > Am 12.09.2011 17:40, schrieb Christopher Brooks: > > Hi Markus, > > > > Yes, I can get you a list of ticket numbers or modules, but not > > both. Will you merge all ticket numbers? > > > > Chris > > > > On Fri, 09 Sep 2011 08:48:26 +0200 > > Markus Moormann<[email protected]> wrote: > > > >> Hi, > >> > >> yesterday I checked in the new structure of the admin UI so that > >> it's nearly impossible to merge the changes back to trunk. Chris, > >> can you say which tickets have been committed to 1.2.x branch > >> after the splitting, so that I can have a look at them and "merge" > >> them by hand? > >> > >> Markus > >> > >> Am 09.09.2011 00:51, schrieb Christopher Brooks: > >>> 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 > >> _______________________________________________ > >> Matterhorn mailing list > >> [email protected] > >> http://lists.opencastproject.org/mailman/listinfo/matterhorn > >> > >> > >> To unsubscribe please email > >> [email protected] > >> _______________________________________________ > > > > -- 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] _______________________________________________
