> I like to work with a git checkout because it is then easy to find all my local changes, look at
> file history, etc. If I were to work from Launchpad as Ralph suggested then would I need
> to learn how to use bazaar?
I just answered my own question. I was able to do a git checkout from Launchpad.
git clone --recursive https://git.launchpad.net/epics-base
I found that it was very slow. It was averaging about 200 KiB/s, which is 20 times slower than the 4 MiB/s I got with Github. Is this normal?
I am still struggling to understand how to checkout the R7.0.1-rc1 tag in the top-level and all submodules. I did what Michael suggested:
corvette:~/scratch/epics-base>git submodule update
corvette:~/scratch/epics-base>git reset --hard R7.0.1-rc1
HEAD is now at 8b97e78 Set version snapshot to -rc1
However, when I go into the modules/ca it is in a different detached HEAD state:
corvette:~/scratch/epics-base>cd modules/ca
/home/epics/scratch/epics-base/modules/ca
corvette:epics-base/modules/ca>git status
# HEAD detached at 5dfd1fc
nothing to commit, working directory clean
corvette:epics-base/modules/ca>git diff --name-status R7.0.1-rc1
D .appveyor.yml
D .ci/appveyor-make.bat
D .ci/appveyor-prepare.bat
D .ci/checkout-modules.sh
D .ci/make-tar.sh
M .ci/travis-build.sh
M .ci/travis-prepare.sh
D .gitattributes
M .gitignore
D .gitmodules
M .travis.yml
M Makefile
D README
...
So it does not appear to have the R7.0.1-rc1 tag checked out?
I then try to explicitly checkout that tag in all submodules, but it fails because that tag does not exist in modules/normativeTypes:
corvette:~/scratch/epics-base>git submodule foreach git checkout R7.0.1-rc1
Entering 'modules/ca'
Previous HEAD position was 5dfd1fc... Export tool configurations as cfg/CONFIG_* files
HEAD is now at 8b97e78... Set version snapshot to -rc1
Entering 'modules/database'
Previous HEAD position was eac8865... Merge 'ignore-siml-failure' into database/master
HEAD is now at 8b97e78... Set version snapshot to -rc1
Entering 'modules/libcom'
Previous HEAD position was 3ca5c20... perl 5.8 compatibility fix
HEAD is now at 8b97e78... Set version snapshot to -rc1
Entering 'modules/normativeTypes'
error: pathspec 'R7.0.1-rc1' did not match any file(s) known to git.
Stopping at 'modules/normativeTypes'; script returned non-zero status.
But if I go to modules/ca it is indeed checked out that the tag I want.
corvette:~/scratch/epics-base>cd modules/ca
/home/epics/scratch/epics-base/modules/ca
corvette:epics-base/modules/ca>git status
# HEAD detached at R7.0.1-rc1
nothing to commit, working directory clean
Thanks,
Mark
> -----Original Message-----
> From: Mark Rivers
> Sent: Monday, December 04, 2017 11:09 AM
> To: 'Andrew Johnson'; Michael Davidsaver; [email protected]
> Subject: RE: EPICS 7 Release Candidate 1
>
> Hi Andrew,
>
> > I just added the correct git clone command to the R7-0/1.php page (it was already on the
> R7-0/index.php page).
>
> Thanks for that. Those instructions say:
>
> *******************************
> To checkout the latest source code using git use the git command below, which will include
> some additional files not in the tarfile. Note that the development branch for EPICS 7 is
> called core/master, and some of the submodules are fetched from Launchpad while others
> are on Github:
>
> git clone --recursive -b core/master https://git.launchpad.net/epics-base base-7.0
> *******************************
>
> Suppose I do that, but then I don't want to work on the master branch, but rather to work
> on the R7.01.-rc1 tag. Can I do that now, or do I need to wait until those tags propagate to
> Github?
>
> I like to work with a git checkout because it is then easy to find all my local changes, look at
> file history, etc. If I were to work from Launchpad as Ralph suggested then would I need
> to learn how to use bazaar?
>
> Any idea why a git clone using ssh ([email protected]:epics-base/epics/base) does not work,
> while it works fine for areaDetector/areaDetector? Is this a permissions problem?
>
> Thanks,
> Mark
>
> > -----Original Message-----
> > From: Andrew Johnson [mailto:[email protected]]
> > Sent: Monday, December 04, 2017 10:47 AM
> > To: Mark Rivers; Michael Davidsaver; [email protected]
> > Subject: Re: EPICS 7 Release Candidate 1
> >
> > Hi Mark,
> >
> > On 12/03/2017 08:21 PM, Mark Rivers wrote:
> > > After doing
> > >
> > > git submodule update
> > > git reset --hard R7.0.1-pre1
> > >
> > > then it built fine.
> >
> > Note that the top-level branch that you need to check out to get the
> > development version is called core/master. Branch names for the
> > submodules are somewhat variable, but 'git submodule update --remote'
> > will update them all to their latest commits.
> >
> > I just added the correct git clone command to the R7-0/1.php page (it
> > was already on the R7-0/index.php page).
> >
> > - Andrew
> >
> > --
> > Arguing for surveillance because you have nothing to hide is no
> > different than making the claim, "I don't care about freedom of
> > speech because I have nothing to say." -- Edward Snowdon
- Replies:
- Re: EPICS 7 Release Candidate 1 Andrew Johnson
- References:
- Re: EPICS 7 Release Candidate 1 Mark Rivers
- Re: EPICS 7 Release Candidate 1 Michael Davidsaver
- Re: EPICS 7 Release Candidate 1 Mark Rivers
- Re: EPICS 7 Release Candidate 1 Mark Rivers
- Re: EPICS 7 Release Candidate 1 Michael Davidsaver
- Re: EPICS 7 Release Candidate 1 Mark Rivers
- Re: EPICS 7 Release Candidate 1 Andrew Johnson
- RE: EPICS 7 Release Candidate 1 Mark Rivers
- Navigate by Date:
- Prev:
RE: EPICS 7 Release Candidate 1 Mark Rivers
- Next:
Re: EPICS 7 Release Candidate 1 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
- Navigate by Thread:
- Prev:
RE: EPICS 7 Release Candidate 1 Mark Rivers
- Next:
Re: EPICS 7 Release Candidate 1 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
|