Experimental Physics and
Industrial Control System

Mark Rivers <[email protected]> · Mon, 4 Dec 2017 02:21:38 +0000

Hi Michael,

Thanks.  After doing

git submodule update

git reset --hard R7.0.1-pre1

then it built fine.

Mark

________________________________
From: Michael Davidsaver <[email protected]>
Sent: Sunday, December 3, 2017 8:14 PM
To: Mark Rivers; Andrew Johnson; [email protected]
Subject: Re: EPICS 7 Release Candidate 1

I should have mentioned that the direct way to do this is:

> git clone --branch R7.0.1-pre1 --recursive https://github.com/epics-base/epics-base

On 12/03/2017 08:00 PM, Mark Rivers wrote:
> Next problem.
>
>
> After successfully cloning with https: I tried to check out the R7.0.1-pre1 tag.  I did this successfully at the top-level, and then tried to do it for each submodule with
>
> git submodule foreach git checkout R7.0.1-pre1

FYI, I think of submodule foreach as a last resort sort of command.
There are generally shorter ways to accomplish the common tasks.
In this instance:

> $ git clone --recursive https://github.com/epics-base/epics-base.git
...
> $ git status
> On branch core/master
> Your branch is up-to-date with 'origin/core/master'.
> nothing to commit, working tree clea> $ git reset --hard R7.0.1-pre1
> $ git status
> On branch core/master
> Your branch is behind 'origin/core/master' by 21 commits, and can be fast-forwarded.
>   (use "git pull" to update your local branch)
> Changes not staged for commit:
>   (use "git add <file>..." to update what will be committed)
>   (use "git checkout -- <file>..." to discard changes in working directory)
>
>         modified:   modules/database (new commits)
>         modified:   modules/libcom (new commits)
>         modified:   modules/normativeTypes (new commits)
>         modified:   modules/pvAccess (new commits)
>         modified:   modules/pvData (new commits)
>         modified:   modules/pvDatabase (new commits)
>         modified:   modules/pva2pva (new commits)
>         modified:   modules/pvaClient (new commits)
> $ git submodule update
> Submodule path 'modules/database': checked out '73c7b8224da6ed1ccb827907d119438bceae1de7'
> Submodule path 'modules/libcom': checked out 'ea7802a8383fa330f2fcc9497bbeca8073325a3e'
> Submodule path 'modules/normativeTypes': checked out '5e151c3b7a23ec4f04332b587349c6ae542d4dd2'
> Submodule path 'modules/pvAccess': checked out 'ba3b777978dbdfb40c59aa94742a41c08618e4b7'
> Submodule path 'modules/pvData': checked out '71966581661ab91e7cfc927c3468639d6d53cf6c'
> Submodule path 'modules/pvDatabase': checked out '955947fd0fff6b83e911e7385ead2d6b308dae29'
> Submodule path 'modules/pva2pva': checked out '413102a4bca07bae097e10850f99b522e3b5e8a5'
> Submodule path 'modules/pvaClient': checked out '5a84b94520f32c9fe3bfe514c19154e4fa0c0804'
> $ git status
> On branch core/master
> Your branch is behind 'origin/core/master' by 21 commits, and can be fast-forwarded.
>   (use "git pull" to update your local branch)
> nothing to commit, working tree clean

I'd point out of few things:

1. I use "git reset --hard ..." to force move the current branch (core/master) to avoid
   working on a detached HEAD.

2. There is no need to work with submodule tags.  The whole point of submodules
   is that the outer/super module handles this for us.
   So "git submodule update" does the trick.

3. yup, it looks like there is a missing tag in the normativeTypesCPP module.

Experimental Physics and Industrial Control System

Experimental Physics and
Industrial Control System