Details

      Description

      We need to merge the latest changes from 1.0 branch into the 1.0.x branch for KC/KS.

      See these notes on the subversion merge process:

      https://test.kuali.org/confluence/x/KYApAQ

        Attachments

          Issue Links

            Activity

            Hide
            gmcgrego Geoff McGregor added a comment -

            Do you have an estimate as to when this might get done? This is pretty critical-path for us right now. Thanks!

            Show
            gmcgrego Geoff McGregor added a comment - Do you have an estimate as to when this might get done? This is pretty critical-path for us right now. Thanks!
            Hide
            ewestfal Eric Westfall added a comment -

            I'm planning to do this tomorrow around 3 pm. Depending on how things go, it may take a little bit of time but I will let you know when it is completed.

            Show
            ewestfal Eric Westfall added a comment - I'm planning to do this tomorrow around 3 pm. Depending on how things go, it may take a little bit of time but I will let you know when it is completed.
            Hide
            ewestfal Eric Westfall added a comment -

            Whoops, didn't mean to assign to Jeremy. Jeremy, I would like to have you work with me on this (over adobe connect) so that you can learn how to do it Thanks.

            Show
            ewestfal Eric Westfall added a comment - Whoops, didn't mean to assign to Jeremy. Jeremy, I would like to have you work with me on this (over adobe connect) so that you can learn how to do it Thanks.
            Hide
            ewestfal Eric Westfall added a comment -

            SInce 1.0.x KC branch was created off of 1.0.0 branch, we need to merge those changes in first.

            Merge command will be:

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

            Show
            ewestfal Eric Westfall added a comment - SInce 1.0.x KC branch was created off of 1.0.0 branch, we need to merge those changes in first. Merge command will be: svn merge -r 7873:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-0-br
            Hide
            ewestfal Eric Westfall added a comment -

            I normally put the merge output on these in a comment, this one is way too large so i'm attaching it.

            Show
            ewestfal Eric Westfall added a comment - I normally put the merge output on these in a comment, this one is way too large so i'm attaching it.
            Hide
            ewestfal Eric Westfall added a comment -

            Finally committing the merge of 1.0.0 into 1.0.x KC. Next is merge of 1.0.1 into 1.0.x KC.

            Show
            ewestfal Eric Westfall added a comment - Finally committing the merge of 1.0.0 into 1.0.x KC. Next is merge of 1.0.1 into 1.0.x KC.
            Hide
            ewestfal Eric Westfall added a comment -

            Need to merge 1.0.1 branch from revision 8903.

            Merge command will be:

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

            Show
            ewestfal Eric Westfall added a comment - Need to merge 1.0.1 branch from revision 8903. Merge command will be: svn merge -r 8903:HEAD https://test.kuali.org/svn/rice/branches/rice-release-1-0-1-br
            Hide
            ewestfal Eric Westfall added a comment -

            Again, too much output to paste into a comment for the 1.0.1 to 1.0.x KC merge. Attaching a file instead.

            Show
            ewestfal Eric Westfall added a comment - Again, too much output to paste into a comment for the 1.0.1 to 1.0.x KC merge. Attaching a file instead.
            Hide
            ewestfal Eric Westfall added a comment -

            I ended up having to redo the second half of this merge. Things are committed now though.

            Show
            ewestfal Eric Westfall added a comment - I ended up having to redo the second half of this merge. Things are committed now though.

              People

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

                Dates

                • Created:
                  Updated:
                  Resolved:

                  Time Tracking

                  Estimated:
                  Original Estimate - 2 hours
                  2h
                  Remaining:
                  Remaining Estimate - 2 hours
                  2h
                  Logged:
                  Time Spent - Not Specified
                  Not Specified