Difference between revisions of "Merging Branches into 3.15"
From EPICSWIKI
(Update on progress) |
|||
| (4 intermediate revisions by the same user not shown) | |||
| Line 1: | Line 1: | ||
Merges to work on: | |||
* [https://code.launchpad.net/~anj/epics-base/reorg-src lp:~anj/epics-base/reorg-src]<br> This is a modified and possibly re-based version of [https://code.launchpad.net/~mdavidsaver/epics-base/reorg-src lp:~mdavidsaver/epics-base/reorg-src] | * [https://code.launchpad.net/~anj/epics-base/reorg-src lp:~anj/epics-base/reorg-src]<br> This is a modified and possibly re-based version of [https://code.launchpad.net/~mdavidsaver/epics-base/reorg-src lp:~mdavidsaver/epics-base/reorg-src] -- DONE | ||
* [https://code.launchpad.net/~anj/epics-base/epicsEvent-api lp:~anj/epics-base/epicsEvent-api] | * [https://code.launchpad.net/~anj/epics-base/epicsEvent-api lp:~anj/epics-base/epicsEvent-api] -- DONE | ||
* [https://code.launchpad.net/~anj/epics-base/process-get lp:~anj/epics-base/process-get] | * [https://code.launchpad.net/~anj/epics-base/process-get lp:~anj/epics-base/process-get]<br>Needs release notes written; Marty also provided code for mrkSoftTest that needs to be integrated into the lp:epics-base-tests project. | ||
* [https://code.launchpad.net/~ralph-lange/epics-base/server-side-plugins lp:~ralph-lange/epics-base/server-side-plugins]<br> I | * [https://code.launchpad.net/~ralph-lange/epics-base/server-side-plugins lp:~ralph-lange/epics-base/server-side-plugins]<br> I started to re-base this branch onto a test merge of the above branches, but I broke the tests in db/test in one of the re-base commits, so I didn't complete this merge and I need to start the re-base again (which is unfortunately not simple since there are conflicts with the variable-length-array-subscriptions code, amongst others). | ||
Other branches to merge (may need reviewing first): | |||
* [https://code.launchpad.net/~dirk.zimoch/epics-base/non-val-attributes lp:~dirk.zimoch/epics-base/non-val-attributes] | |||
* [https://code.launchpad.net/~dirk.zimoch/epics-base/named-soft-events lp:~dirk.zimoch/epics-base/named-soft-events] | |||
* [https://code.launchpad.net/~johill-lanl/epics-base/R3.15-buildCompilerSpecific lp:~johill-lanl/epics-base/R3.15-buildCompilerSpecific] when complete. | |||
* Atomic operations branch after agreement | |||
Latest revision as of 01:03, 24 August 2011
Merges to work on:
- lp:~anj/epics-base/reorg-src
This is a modified and possibly re-based version of lp:~mdavidsaver/epics-base/reorg-src -- DONE - lp:~anj/epics-base/epicsEvent-api -- DONE
- lp:~anj/epics-base/process-get
Needs release notes written; Marty also provided code for mrkSoftTest that needs to be integrated into the lp:epics-base-tests project. - lp:~ralph-lange/epics-base/server-side-plugins
I started to re-base this branch onto a test merge of the above branches, but I broke the tests in db/test in one of the re-base commits, so I didn't complete this merge and I need to start the re-base again (which is unfortunately not simple since there are conflicts with the variable-length-array-subscriptions code, amongst others).
Other branches to merge (may need reviewing first):
- lp:~dirk.zimoch/epics-base/non-val-attributes
- lp:~dirk.zimoch/epics-base/named-soft-events
- lp:~johill-lanl/epics-base/R3.15-buildCompilerSpecific when complete.
- Atomic operations branch after agreement
