2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 | Index | 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 <2018> 2019 2020 2021 2022 2023 2024 |
<== Date ==> | <== Thread ==> |
---|
Subject: | Re: RTEMS-5 integration |
From: | "Williams Jr., Ernest L." <[email protected]> |
To: | Ralph Lange <[email protected]>, Benjamin Franksen <[email protected]> |
Cc: | EPICS Core Talk <[email protected]> |
Date: | Tue, 26 Jun 2018 15:59:19 +0000 |
Hi Ralph,
Can I just proceed with the following and pickup these changes? git pull
git submodule update --remote
Cheers, Ernest From: [email protected] <[email protected]> on behalf of Ralph Lange <[email protected]>
Sent: Tuesday, June 26, 2018 8:34 AM To: Benjamin Franksen Cc: EPICS Core Talk Subject: Re: RTEMS-5 integration The repositories of the modules (core, libcom, database, ca) that were separate branches on the epics-core repo have been merged (recombined), without changing the file structure.
The resulting new-focus-of-attention branch is called '7.0' (in line with the other release series' branch names).
You can try to merge the request for core straight into 7.0 - in that case the structure has not changed.
For the libcom request, the underlying structure has changed, so you would either have to move everything into modules/libcom on the proposal branch before trying to merge, or create a set of patch files that you can try to apply to a 7.0 clone while being
in modules/libcom.
Lots of overhead, I know. But it is the only merge request that is affected.
Cheers,
~Ralph On Tue, Jun 26, 2018 at 5:24 PM Benjamin Franksen <[email protected]> wrote:
On 06/26/2018 01:40 PM, Ralph Lange wrote: |