Details

    • Type: Task
    • Status: Closed
    • Priority: Blocker
    • Resolution: Fixed
    • Affects Version/s: None
    • Fix Version/s: 1.0.1
    • Component/s: Source Control
    • Labels:
      None

      Description

      The first commit on 1.0.1 branch was at revision 8910, so merge command will be:

      svn merge -r 8909:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-0-br

        Attachments

          Activity

          Hide
          ewestfal Eric Westfall added a comment -

          Merge output:

          129-79-44-103:rice-1.0.1 ewestfal$ svn merge -r 8909:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-0-br
          C ksb/pom.xml
          C kim/pom.xml
          C kew/pom.xml
          A scripts/dataset/impex-build.properties.sample
          U scripts/upgrades/0.9.3 to 1.0.0/final/kim-create.sql
          U scripts/upgrades/0.9.3 to 1.0.0/final/kns-upgrade-0.9.3-to-0.9.4-part2.sql
          A scripts/upgrades/0.9.3 to 1.0.0/final/kim_group_import.sql
          U scripts/upgrades/0.9.3 to 1.0.0/final/kim-data.sql
          U scripts/upgrades/0.9.3 to 1.0.0/final/update_final.sql
          U scripts/upgrades/0.9.3 to 1.0.0/final/README.txt
          A scripts/upgrades/0.9.3 to 1.0.0/final/kim_entity_import_from_kew.sql
          A scripts/upgrades/0.9.3 to 1.0.0/db-updates-during-qa/08-13-2009.sql
          C scripts/createproject.groovy
          C pom.xml
          C kns/pom.xml
          U build.xml
          C kcb/pom.xml
          A NOTICE.txt
          C impl/src/main/java/org/kuali/rice/kim/inquiry/PermissionInquirableImpl.java
          U impl/src/main/java/org/kuali/rice/kim/service/impl/UiDocumentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kim/lookup/RoleLookupableHelperServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kns/service/impl/AttachmentServiceImpl.java
          U impl/src/main/java/org/kuali/rice/kns/config/KNSConfigurer.java
          U impl/src/main/resources/META-INF/common-config-defaults.xml
          U impl/src/main/resources/KR-ApplicationResources.properties
          C impl/pom.xml
          A config/examples
          A config/examples/struts-config.example.xml
          U config/templates/createproject.pom.template.xml
          C api/pom.xml
          U README.txt
          C ken/pom.xml
          U web/src/test/java/org/kuali/rice/web/lookup/ValuesFinderTest.java
          U web/src/main/config/standalone-config/acknowledgments.jsp
          U web/src/main/config/example-config/rice-config.xml
          U web/src/main/webapp/acknowledgments.jsp
          C web/pom.xml

          Show
          ewestfal Eric Westfall added a comment - Merge output: 129-79-44-103:rice-1.0.1 ewestfal$ svn merge -r 8909:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-0-br C ksb/pom.xml C kim/pom.xml C kew/pom.xml A scripts/dataset/impex-build.properties.sample U scripts/upgrades/0.9.3 to 1.0.0/final/kim-create.sql U scripts/upgrades/0.9.3 to 1.0.0/final/kns-upgrade-0.9.3-to-0.9.4-part2.sql A scripts/upgrades/0.9.3 to 1.0.0/final/kim_group_import.sql U scripts/upgrades/0.9.3 to 1.0.0/final/kim-data.sql U scripts/upgrades/0.9.3 to 1.0.0/final/update_final.sql U scripts/upgrades/0.9.3 to 1.0.0/final/README.txt A scripts/upgrades/0.9.3 to 1.0.0/final/kim_entity_import_from_kew.sql A scripts/upgrades/0.9.3 to 1.0.0/db-updates-during-qa/08-13-2009.sql C scripts/createproject.groovy C pom.xml C kns/pom.xml U build.xml C kcb/pom.xml A NOTICE.txt C impl/src/main/java/org/kuali/rice/kim/inquiry/PermissionInquirableImpl.java U impl/src/main/java/org/kuali/rice/kim/service/impl/UiDocumentServiceImpl.java U impl/src/main/java/org/kuali/rice/kim/lookup/RoleLookupableHelperServiceImpl.java U impl/src/main/java/org/kuali/rice/kns/service/impl/AttachmentServiceImpl.java U impl/src/main/java/org/kuali/rice/kns/config/KNSConfigurer.java U impl/src/main/resources/META-INF/common-config-defaults.xml U impl/src/main/resources/KR-ApplicationResources.properties C impl/pom.xml A config/examples A config/examples/struts-config.example.xml U config/templates/createproject.pom.template.xml C api/pom.xml U README.txt C ken/pom.xml U web/src/test/java/org/kuali/rice/web/lookup/ValuesFinderTest.java U web/src/main/config/standalone-config/acknowledgments.jsp U web/src/main/config/example-config/rice-config.xml U web/src/main/webapp/acknowledgments.jsp C web/pom.xml
          Hide
          ewestfal Eric Westfall added a comment - - edited

          Done. As suspected, most of the conflicts were related to the updating of the version number in the pom.xml files.

          Show
          ewestfal Eric Westfall added a comment - - edited Done. As suspected, most of the conflicts were related to the updating of the version number in the pom.xml files.

            People

            • Assignee:
              ewestfal Eric Westfall
              Reporter:
              ewestfal Eric Westfall
            • Votes:
              0 Vote for this issue
              Watchers:
              0 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved: