Hi Chris, Thanks for following up on this! I finished my merges last week, will need to check what went wrong.
Tobias On 29.09.2011, at 01:12, Christopher Brooks wrote: > I updated trunk and branch 1.2.x to the same head version, version > 11029. I then attempted to merge the two to determine where conflicts > may still lie: > > cd /opt/matterhorn/matterhorn_trunk > svn merge --dry-run https://opencast.jira.com/svn/MH/branches/1.2.x . > > I filed conflicts to several committers as subtickets here: > > https://opencast.jira.com/browse/MH-8189 > > If you can't fix these (for whatever reason), please hive off what you > can and create other tickets for other committers for the ones you > can't. These merge changes are blocking the ability to cut 1.3 cleanly. > > Tobias and Markus K, and work on the integration tests/selenium tests > respectively? > > 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] > _______________________________________________ _______________________________________________ Matterhorn mailing list [email protected] http://lists.opencastproject.org/mailman/listinfo/matterhorn To unsubscribe please email [email protected] _______________________________________________
