Experimental Physics and Industrial Control System
|
Subject: |
Re: Understanding the GIT organization and workflow for EPICS 7 |
From: |
Bruce Hill <[email protected]> |
To: |
<[email protected]> |
Date: |
Wed, 28 Feb 2018 00:57:26 -0800 |
I'm still trying to figure out a good workflow for introducing local
build changes and other local commits. I'm finding the first step
is to create your own local branch.
git co core/master
git co -b core/slac-master
Once this is done you at least have a branch where you can save
and manage local commits without making commits on core/master
that you'll later regret when you want to pull the latest
core/master updates.
I also modified my core/slac-branch .gitmodules file to list our
SLAC repos,
although I think that can also be done by changing your config
settings
submodule.modules/pvAccess.url, etc . Still experimenting w/ this
and
how to control which version of each submodule is checked out, as we
often would want to build the latest tagged release of pvAccess or
pvData
instead of their master branch.
I haven't figured out how to checkout a tagged module in one step
from TOP, but
these steps work for me so far.
pushd modules/pvAccess
git co R6.0.0-0.3.0
popd
git add modules/pvAccess
# Commit changes if you want to checkout and/or update core/master
git ci -m "Updated pvAccess to R6.0.0-0.3.0"
git co core/master
git pull
git submodule update
Cheers,
- Bruce
On 02/23/2018 02:08 AM, Ralph Lange
wrote:
--
Bruce Hill
Member Technical Staff
SLAC National Accelerator Lab
2575 Sand Hill Road M/S 10
Menlo Park, CA 94025
|
- Replies:
- Re: Understanding the GIT organization and workflow for EPICS 7 Andrew Johnson
- References:
- Understanding the GIT organization and workflow for EPICS 7 Williams Jr., Ernest L.
- Re: Understanding the GIT organization and workflow for EPICS 7 Andrew Johnson
- Re: Understanding the GIT organization and workflow for EPICS 7 Dirk Zimoch
- Re: Understanding the GIT organization and workflow for EPICS 7 Ralph Lange
- Navigate by Date:
- Prev:
Re: pvput to bo record Williams Jr., Ernest L.
- Next:
Re: Named Event, TSE and GeneralTime Bruce Hill
- 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: Understanding the GIT organization and workflow for EPICS 7 Ralph Lange
- Next:
Re: Understanding the GIT organization and workflow for EPICS 7 Andrew Johnson
- 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, 28 Feb 2018 |
·
Home
·
News
·
About
·
Base
·
Modules
·
Extensions
·
Distributions
·
Download
·
·
Search
·
EPICS V4
·
IRMIS
·
Talk
·
Bugs
·
Documents
·
Links
·
Licensing
·
|