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]
_______________________________________________
