Thanks, Darius. I agree that arden should be its own module. Sorry about the whitespace issues with trunk. I created the patch off of 1.8.x. I can create a patch off trunk if you need me to.

Thanks,

Tammy

On 9/9/2011 1:10 AM, Darius Jazayeri wrote:
Thanks Tammy, this applied cleanly to 1.8.x. It doesn't apply to trunk due to what looks like whitespace issues, so I'll take a look at that tomorrow.

I guess we don't need to make Arden a module just yet, although we should still do that eventually.

-Darius

On Thu, Sep 8, 2011 at 8:33 AM, Tammy Dugan <[email protected] <mailto:[email protected]>> wrote:

    Darius,

    I committed the arden package changes to 1.6.x. I don't have a
    build environment setup for 1.8.x and trunk so have attached an
    arden patch that should work for both of them. Please let me know
    if you have any problems.

    Thanks,

    Tammy


    On 9/8/2011 9:28 AM, Tammy Dugan wrote:
    Darius,

    I'll take a look at this today and see if I can fix things up.


    Tammy

    On 9/7/2011 8:18 PM, Darius Jazayeri wrote:
    I'm trying to commit Steve's patch from TRUNK-2636, and running
    into problems. I was able to commit it to 1.7.x but...

    @Win, you didn't review/comment on TRUNK-2587, so I forgot that
    I had to backport/up-port that before being able to apply
    Steve's current patch. Okay, just a small hiccup, so I tried to
    apply that patch first.

    @Tammy, in July you made a big ticket-less commit to 1.7.x
    (rev:21377
    <https://source.openmrs.org/changelog/OpenMRS?cs=21377>) that
    that didn't get backported to 1.6.x or up-ported to 1.8.x or
    trunk. (You may have told me about this at the time--I haven't
    looked back at my email.) That commit touches some files that
    Steve touches in his patch on TRUNK-2587, so I can't apply that
    patch to 1.6/1.8/trunk.

    (Before realizing what was going on, I did some manual copying
    and pasting to backport the TRUNK-2587 patch to 1.6.x
    in rev:23186. We may need to back this out if it causes further
    problems.)

    I'm not quite sure how to proceed here. As it stands now only
    1.7.x has functional/updated Arden code, and 1.6.x, 1.8.x, and
    trunk do not. The easiest thing from my perspective would be to
    remove all the arden stuff from core entirely, and put it in an
    Arden module, so we don't have to muck around with trying to
    repair this.

    Alternately we can try to apply rev:21377 and any other changes
    Tammy may have made directly to 1.7.x to the other branches,
    then I can backport Steve's patches. But I don't have the
    bandwidth to deal with this right now.

    Thoughts?

    -Darius

-- Tammy Dugan
    CHIRDL Technical Lead
    Children's Health Services Research
    IU School of Medicine
    ------------------------------------------------------------------------
    Click here to unsubscribe
    <mailto:[email protected]?body=SIGNOFF%20openmrs-devel-l>
from OpenMRS Developers' mailing list

-- Tammy Dugan
    CHIRDL Technical Lead
    Children's Health Services Research
    IU School of Medicine

    ------------------------------------------------------------------------
    Click here to unsubscribe
    <mailto:[email protected]?body=SIGNOFF%20openmrs-devel-l> from
OpenMRS Developers' mailing list

------------------------------------------------------------------------
Click here to unsubscribe <mailto:[email protected]?body=SIGNOFF%20openmrs-devel-l> from OpenMRS Developers' mailing list

--
Tammy Dugan
CHIRDL Technical Lead
Children's Health Services Research
IU School of Medicine


_________________________________________

To unsubscribe from OpenMRS Developers' mailing list, send an e-mail to 
[email protected] with "SIGNOFF openmrs-devel-l" in the  body (not 
the subject) of your e-mail.

[mailto:[email protected]?body=SIGNOFF%20openmrs-devel-l]

Reply via email to