Merging Information
- Thomas Amsler
Owned by Thomas Amsler
psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -c 2752 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 . U app/sakai-tool/src/webapp/WEB-INF/spring-facades.xml C app/sakai-tool/src/webapp/WEB-INF/web.xml Skipped missing target: 'app/standalone-app/project.properties' U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/CourseGradeDetailsBean.java C app/ui/src/java/org/sakaiproject/tool/gradebook/ui/GradebookDependentBean.java C app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java A app/ui/src/java/edu A app/ui/src/java/edu/ucdavis A app/ui/src/java/edu/ucdavis/smartsite A app/ui/src/java/edu/ucdavis/smartsite/gradebook A app/ui/src/java/edu/ucdavis/smartsite/gradebook/converter A app/ui/src/java/edu/ucdavis/smartsite/gradebook/converter/FinalGradingToolDataFileWriterCsv.java U app/ui/src/bundle/org/sakaiproject/tool/gradebook/bundle/Messages.properties ==> Fixed conflicts Committed revision 4482. psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -c 2902 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 . U app/business/src/java/org/sakaiproject/tool/gradebook/business/impl/GradebookManagerHibernateImpl.java ==> No conflicts Committed revision 4483. psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -c 3511 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 . U app/ui/src/webapp/courseGradeDetails.jsp ==> No conflicts Committed revision 4484. psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -c 3539 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 . C service/hibernate/src/java/org/sakaiproject/tool/gradebook/Category.java ==> Fixed conflict No commit since fixing conflict reverted to original trunk code psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -c 3986 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 . C .classpath Skipped missing target: 'app/project.xml' U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/SpreadsheetUploadBean.java U app/ui/src/webapp/spreadsheetUpload.jsp C app/ui/pom.xml ==> Fixed conflicts Committed revision 4485. psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -c 4016 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 . A app/ui/src/java/org/sakaiproject/tool/gradebook/ui/ScantronImportHelper.java ==> No conflict Committed revision 4486. psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -c 4326 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 . U .classpath Skipped missing target: 'app/ui/project.xml' U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/SpreadsheetUploadBean.java U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/ScantronImportHelper.java C app/ui/pom.xml ==> Fixed conflict Committed revision 4487. psl-247 : ~/src/sakai-trunk-ucd/gradebook/ # svn merge -c 4417 https://mware.ucdavis.edu/svn/ucd-sakai/gradebook/branches/post_2-4-0 . U app/ui/src/java/org/sakaiproject/tool/gradebook/ui/EnrollmentTableBean.java ==> No conflict Committed revision 4488.