Difference between revisions of "Merging Branches into 3.15"
From EPICSWIKI
m |
|||
| Line 4: | Line 4: | ||
* [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] | ||
* [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] | ||
* [https://code.launchpad.net/~ralph-lange/epics-base/server-side-plugins lp:~ralph-lange/epics-base/server-side-plugins]<br> I already re-based this branch once onto a recent 3.14, but I don't think I got it right; I broke the tests in db/test in one of the re-base commits, so I didn't complete this merge. | * [https://code.launchpad.net/~ralph-lange/epics-base/server-side-plugins lp:~ralph-lange/epics-base/server-side-plugins]<br> I already re-based this branch once onto a recent 3.14, but I don't think I got it right; 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 do the re-base again (which is unfortunately not simple since there are conflicts with the variable-length array subscriptions code, amongst others). | ||
Revision as of 22:11, 17 August 2011
Merge order already used once by ANJ:
- lp:~anj/epics-base/reorg-src
This is a modified and possibly re-based version of lp:~mdavidsaver/epics-base/reorg-src - lp:~anj/epics-base/epicsEvent-api
- lp:~anj/epics-base/process-get
- lp:~ralph-lange/epics-base/server-side-plugins
I already re-based this branch once onto a recent 3.14, but I don't think I got it right; 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 do the re-base again (which is unfortunately not simple since there are conflicts with the variable-length array subscriptions code, amongst others).
