Re: How to move to the new 7.0 branch (was: RTEMS-5 integration)

[Ralph Lange <ralph.lange@gmx.de>]

To roll forward from an existing checkout of 'core/master' to the new reconstituted '7.0' branch:

> make distclean
> git submodule deinit modules/{libcom,ca,database}
> git checkout 7.0
> git submodule update

If you're working on a fresh clone, the last two lines should suffice.

Cheers,
~Ralph

On Tue, Jun 26, 2018 at 5:59 PM Williams Jr., Ernest L. <ernesto@slac.stanford.edu> wrote:

Hi Ralph,

Can I just proceed with the following and pickup these changes?

git pull

git submodule update --remote

Cheers,

Ernest

---

From: core-talk-bounces@aps.anl.gov <core-talk-bounces@aps.anl.gov> on behalf of Ralph Lange <ralph.lange@gmx.de>
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).