Experimental Physics and
Industrial Control System

Dirk Zimoch <[email protected]> · Fri, 21 Sep 2018 15:09:05 +0200

Just saw your lauchpad mails.

core/master is dead since we re-united the base modules into a single branch.
7.0 is the default branch ever since.

Ah. That explains something. I try again with 7.0...

On 21.09.2018 15:05, Dirk Zimoch wrote:

Hi Ralph,

But it looks like two different repos. In the top directory I branched

from core/master where I find [submodule "modules/libcom"] in the

.gitmodules file. And my changes in modules/libcom are not visible to

git status in the top directory.

In modules/libcom I see a 7.0 branch instead and git status shows my

changes.

I have now filed two separate merge requests with a dependency. I hope

that does not screw up anything.

The change is to bring vxWorks 5 back in EPICS 7.

Dirk

On 21.09.2018 14:46, Ralph Lange wrote:

Dirk,

While libcom is a directory inside the module directory, it is *not* a

Git submodule.

A regular merge proposal on LaunchPad will do.

Cheers,
~Ralph

On Fri, 21 Sep 2018 at 14:35, Dirk Zimoch <[email protected]

<mailto:[email protected]>> wrote:

    Hi,

    I have a change that affects files in configure/ as well as in
    modules/libcom/.

    As modules/libcom is a submodule, how to handle this?

    Dirk