Argonne National Laboratory

Experimental Physics and
Industrial Control System

2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  <20182019  2020  2021  Index 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  <20182019  2020  2021 
<== Date ==> <== Thread ==>

Subject: Understanding the GIT organization and workflow for EPICS 7
From: "Williams Jr., Ernest L." <ernesto@slac.stanford.edu>
To: EPICS core-talk <core-talk@aps.anl.gov>
Date: Thu, 22 Feb 2018 06:16:09 +0000

Hi,


First, please forgive me for any GIT 101 questions.


We are trying to understand how to work with updating our EPICS 7 release here at SLAC.


So, when updates or patches are applied what is the process for us to update and build?


I have recently cloned.

Installing EPICS 7 core/master:

git clone -b core/master https://git.launchpad.net/epics-base master-base-7.0 
git submodule update --init --reference ./


[ernesto@localhost master-base-7.0]$ git branch -a
* core/master
 remotes/origin/3.13
 remotes/origin/3.14
 remotes/origin/3.15
 remotes/origin/3.16
 remotes/origin/HEAD -> origin/core/master
 remotes/origin/ca/master
 remotes/origin/core/master
 remotes/origin/database/master
 remotes/origin/libcom/master
[ernesto@localhost master-base-7.0]$

A few questions:

  1. Will the EPICS BASE associated with EPICS 7 be called 3.17, when ready production release?

           I learned from Michael that 3.16 is different from the HEAD (i.e. core/master)

      2. What is the key feature set planned for the "HEAD"?

      3. How do I stay in synch with the HEAD (i.e.  git pull) ?

      4. Looks like "ca", "core", "database", and "libcom"  are git submodules?


Well, I see via the ".gitmodules" file the submodule organization.


So, finally can I have an example which demonstrates how to update modules/ca ?

The current state is:

[ernesto@localhost ca]$ git branch
* (HEAD detached at eb683aa8a)
 core/master
[ernesto@localhost ca]$


To stay in synch; is this where I should:

(a) git checkout master

(b) git pull


Cheers,


Ernest Williams
Dept. Head, Advanced Control Systems
Advanced Instrumentation Research, Technology Innovation Directorate
SLAC National Laboratory, Stanford University

Replies:
Re: Understanding the GIT organization and workflow for EPICS 7 Andrew Johnson
Re: Understanding the GIT organization and workflow for EPICS 7 Dirk Zimoch

Navigate by Date:
Prev: Re: pvAccessJava bug reporting Ralph Lange
Next: Re: EPICS 7 : core/master: pvget: Unknown provider "pva" Williams Jr., Ernest L.
Index: 2002  2003  2004  2005  2006  2007  2008  2009  2010  2011  2012  2013  2014  2015  2016  2017  <20182019  2020  2021 
Navigate by Thread:
Prev: Re: pvAccessJava bug reporting 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  <20182019  2020  2021 
ANJ, 01 Mar 2018 Valid HTML 4.01! · Home · News · About · Base · Modules · Extensions · Distributions · Download ·
· Search · EPICS V4 · IRMIS · Talk · Bugs · Documents · Links · Licensing ·