Experimental Physics and Industrial Control System
|
Subject: |
Re: how to push a changes in base 7.0 AND libcom? |
From: |
Ralph Lange <[email protected]> |
To: |
EPICS Core Talk <[email protected]> |
Date: |
Fri, 21 Sep 2018 15:16:56 +0200 |
Yes, please.
The 7.0 branch has the parent and three modules locally as directories under modules, the other modules are Git submodules.
Cheers, ~Ralph
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
>>
- References:
- how to push a changes in base 7.0 AND libcom? Dirk Zimoch
- Re: how to push a changes in base 7.0 AND libcom? Ralph Lange
- Re: how to push a changes in base 7.0 AND libcom? Dirk Zimoch
- Re: how to push a changes in base 7.0 AND libcom? Dirk Zimoch
- Navigate by Date:
- Prev:
Re: how to push a changes in base 7.0 AND libcom? Dirk Zimoch
- Next:
Build failed in Jenkins: EPICS-7 #108 Jenkins Epics PSI
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
<2018>
2019
2020
2021
2022
2023
2024
- Navigate by Thread:
- Prev:
Re: how to push a changes in base 7.0 AND libcom? Dirk Zimoch
- Next:
Re: how to push a changes in base 7.0 AND libcom? Benjamin Franksen
- Index:
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
<2018>
2019
2020
2021
2022
2023
2024
|
ANJ, 24 Sep 2018 |
·
Home
·
News
·
About
·
Base
·
Modules
·
Extensions
·
Distributions
·
Download
·
·
Search
·
EPICS V4
·
IRMIS
·
Talk
·
Bugs
·
Documents
·
Links
·
Licensing
·
|