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 _________________________________________ 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]
