Details

    • Type: Task Task
    • Status: Closed Closed
    • Priority: Major Major
    • Resolution: Fixed
    • Affects Version/s: 2.2
    • Fix Version/s: 2.3.0-m1, 2.3
    • Component/s: Development, Source Control
    • Security Level: Public (Public: Anyone can view)
    • Labels:
      None
    • Similar issues:
      KULRICE-10068Do weekly merges (2013-08-04)
      KULRICE-10157Do weekly merges (2013-08-11)
      KULRICE-10199Do weekly merges (2013-08-17)
      KULRICE-10273Do weekly merges (2013-08-23)
      KULRICE-10274Do weekly merges (2013-08-30)
      KULRICE-10275Do weekly merges (2013-09-06)
      KULRICE-10276Do weekly merges (2013-09-13)
      KULRICE-10537Do weekly merges (2013-09-27)
      KULRICE-10812Do weekly merges (2013-10-04)
      KULRICE-10813Do weekly merges (2013-10-11)
    • KAI Review Status:
      Not Required
    • KTI Review Status:
      Not Required

      Description

      Do the Friday merges. This week it includes:

      1. merge rice-2.1 into rice-2.2
      2. merge rice-2.2 into trunk

        Issue Links

          Activity

          Hide
          Peter Giles (Inactive) added a comment -

          Merge output for rice-2.1 -> rice-2.2:

          gilesp@monolith:/tmp/rice-2.2$ svn merge --accept=postpone -r37732:37873 https://svn.kuali.org/repos/rice/branches/rice-2.1
          --- Merging r37733 through r37873 into '.':
          C    src/site/docbook/css/stylesheet.css
          U    src/site/docbook/help/state.xml
          U    src/site/docbook/help/parameter.xml
          U    src/site/docbook/help/county.xml
          U    src/site/docbook/help/parameter_type.xml
          U    src/site/docbook/help/address_type.xml
          U    src/site/docbook/help/campus.xml
          U    src/site/docbook/help/permission.xml
          U    src/site/docbook/help/campus_type.xml
          U    src/site/docbook/help/group.xml
          U    src/site/docbook/help/namespace.xml
          U    src/site/docbook/help/postal_code.xml
          U    src/site/docbook/help/role.xml
          U    src/site/docbook/help/parameter_component.xml
          U    src/site/docbook/help/country.xml
          U    src/site/docbook/help/person.xml
          U    src/site/docbook/help/phone_type.xml
          U    src/site/docbook/help/responsibility.xml
          U    src/site/docbook/help/document_type.xml
          U    src/site/docbook/TRG/TRG_KEW.xml
          U    src/site/docbook/stylesheets/fo-stylesheet.xsl
          C    src/site/docbook/books/release-notes.xml
          U    build.xml
          U    impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibilityAction.java
          U    impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibility.java
          U    impl/src/main/java/org/kuali/rice/kim/service/impl/UiDocumentServiceImpl.java
          A    impl/src/main/java/org/kuali/rice/kns/service/impl/NoOpSessionDocumentServiceImpl.java
          C    impl/src/main/resources/org/kuali/rice/kns/config/KNSSpringBeans.xml
          U    README.txt
          Summary of conflicts:
            Text conflicts: 3
          gilesp@monolith:/tmp/rice-2.2$
          
          Show
          Peter Giles (Inactive) added a comment - Merge output for rice-2.1 -> rice-2.2: gilesp@monolith:/tmp/rice-2.2$ svn merge --accept=postpone -r37732:37873 https: //svn.kuali.org/repos/rice/branches/rice-2.1 --- Merging r37733 through r37873 into '.': C src/site/docbook/css/stylesheet.css U src/site/docbook/help/state.xml U src/site/docbook/help/parameter.xml U src/site/docbook/help/county.xml U src/site/docbook/help/parameter_type.xml U src/site/docbook/help/address_type.xml U src/site/docbook/help/campus.xml U src/site/docbook/help/permission.xml U src/site/docbook/help/campus_type.xml U src/site/docbook/help/group.xml U src/site/docbook/help/namespace.xml U src/site/docbook/help/postal_code.xml U src/site/docbook/help/role.xml U src/site/docbook/help/parameter_component.xml U src/site/docbook/help/country.xml U src/site/docbook/help/person.xml U src/site/docbook/help/phone_type.xml U src/site/docbook/help/responsibility.xml U src/site/docbook/help/document_type.xml U src/site/docbook/TRG/TRG_KEW.xml U src/site/docbook/stylesheets/fo-stylesheet.xsl C src/site/docbook/books/release-notes.xml U build.xml U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibilityAction.java U impl/src/main/java/org/kuali/rice/kim/bo/ui/KimDocumentRoleResponsibility.java U impl/src/main/java/org/kuali/rice/kim/service/impl/UiDocumentServiceImpl.java A impl/src/main/java/org/kuali/rice/kns/service/impl/NoOpSessionDocumentServiceImpl.java C impl/src/main/resources/org/kuali/rice/kns/config/KNSSpringBeans.xml U README.txt Summary of conflicts: Text conflicts: 3 gilesp@monolith:/tmp/rice-2.2$
          Hide
          Peter Giles (Inactive) added a comment -

          Merge commands for rice-2.2 -> trunk:

          r37820:37874

          svn co https://svn.kuali.org/repos/rice/trunk
          cd trunk/rice-framework/krad-web-framework/
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/krad/krad-web-framework
          cd ../../rice-middleware/core
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/core
          cd ../impl
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/impl
          cd ../kew
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/kew
          cd ../kim
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/kim
          cd ../krms
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/krms
          cd ../../rice-framework/krad-web
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/web
          cd ../../db
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/db
          cd ../rice-middleware/it/
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/it
          cd ../../src/
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/src
          svn revert site/docbook/books/release-notes.xml
          cd ../scripts/
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/scripts
          cd ../rice-middleware/sampleapp/
          svn merge --accept=postpone -r37820:37874 https://svn.kuali.org/repos/rice/branches/rice-2.2/sampleapp
          
          Show
          Peter Giles (Inactive) added a comment - Merge commands for rice-2.2 -> trunk: r37820:37874 svn co https: //svn.kuali.org/repos/rice/trunk cd trunk/rice-framework/krad-web-framework/ svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/krad/krad-web-framework cd ../../rice-middleware/core svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/core cd ../impl svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/impl cd ../kew svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/kew cd ../kim svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/kim cd ../krms svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/krms cd ../../rice-framework/krad-web svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/web cd ../../db svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/db cd ../rice-middleware/it/ svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/it cd ../../src/ svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/src svn revert site/docbook/books/release-notes.xml cd ../scripts/ svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/scripts cd ../rice-middleware/sampleapp/ svn merge --accept=postpone -r37820:37874 https: //svn.kuali.org/repos/rice/branches/rice-2.2/sampleapp

            People

            • Assignee:
              Peter Giles (Inactive)
              Reporter:
              Peter Giles (Inactive)
            • Votes:
              0 Vote for this issue
              Watchers:
              1 Start watching this issue

              Dates

              • Created:
                Updated:
                Resolved:

                Structure Helper Panel