merge wnels2  2010-02-25 19:05
Status: Closed
 
I'm trying to sync a branch to the trunk. The branch was created at r12993, right be fore the 10.1 branch.
Build is failing because it cannot find org.labkey.data.xml.ActionLink. It appears that this package is created during the build; the package is there but not the class.
Thanks,
Bill
 
 
Karl Lum responded:  2010-02-26 10:00
Bill, the class in question is generated by Xbeans from pipelineOptions.xsd. The change that introduced ActionLink would have been r12990, which should have been before your branch and before the 10.1 release branch (13058).

Hope this helps.
 
wnels2 responded:  2010-03-01 09:09
Thanks, that did help. There was a lag between my last update and branch. It merged much better this time with the correct revision range.
I am getting a drt error in the junit test. I hope it is not related to the merge. Have your seen this error before?

Thanks,
Bill

    [junit]
    [junit] org.labkey.api.security.PasswordExpiration$TestCase(org.labkey.test.
drt.JUnitTest$RemoteTest)
    [junit] junit.framework.AssertionFailedError: remote junit failed: org.labke
y.api.security.PasswordExpiration$TestCase
    [junit] ran: 1, errors: 0, failed: 1
    [junit] testExpirations
    [junit] junit.framework.AssertionFailedError: Invalid number of expiration
s for SixMonths expected:<33> but was:<34>
    [junit] at org.labkey.api.security.PasswordExpiration$TestCase.testExpir
ation(PasswordExpiration.java:104)
    [junit] at org.labkey.api.security.PasswordExpiration$TestCase.testExpir
ations(PasswordExpiration.java:85)
 
adam responded:  2010-03-01 09:19
You can ignore that -- it's a bug in the test that I will fix shortly. (28 days hath February...)
 
wnels2 responded:  2010-03-01 09:49
Well then, I think I'm almost ready to commit.
I still have one more little issue though:
The Pipeline web part on the MS2 Dashboard is not refreshing (not like a cool breeze; it doesn't auto update the pipeline statuses). on Chrome or FireFox. Does this happen there as well or is it a merge problem?

Thanks,
Bill
 
wnels2 responded:  2010-03-01 10:18
Are updates to the 10.1 branch automatically merged with the trunk?
 
Karl Lum responded:  2010-03-01 10:49
They have to be done manually, but someone from the core team will periodically perform merges.
 
jeckels responded:  2010-03-01 13:42
Hi Bill,

Thanks for the report on the refresh problem. It's an unintended consequence of a different fix that I made late in 10.1. I should be able to get it fixed before the final 10.1 build.

https://www.labkey.org/issues/home/Developer/issues/details.view?issueId=9882

Thanks,
Josh