From d3831b39740b575fe81c116c7a779f4b1467f0bb Mon Sep 17 00:00:00 2001 From: Markus Zolliker Date: Mon, 1 Mar 2021 14:31:02 +0100 Subject: [PATCH] fix doc and REAMDE Change-Id: I2e022e29e52511ca1a7f529d6d1bae44a995a073 --- README.md | 16 ++++++++++++++++ doc/source/index.rst | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f085fdf..3b7b876 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ current running code at SINQ, with newest changes not yet pushed through the Gerrit workflow at MLZ +## Branches + branches: - mlz: master from forge.frm2.tum.de:29418/sine2020/secop/playground @@ -39,3 +41,17 @@ changes are done, eventually a sync step should happen: 6) in wip: cherry-pick commits not yet feeded into Gerrit from copy in step (1) 7) decide from where to take new work branch (probably from wip) 8) delete branch copies not needed any more + + +## Procedure to update PPMS + +1) git checkout wip (or work, whatever state to copy to ppms) +2) git checkout -B ppms # local branch ? +3) assume PPMSData is mounted on /Volumes/PPMSData + + cp -r secop_psi /Volumes/PPMSData/zolliker/frappy/secop_psi + cp -r secop /Volumes/PPMSData/zolliker/frappy/secop + + it may be that additional folder have to copied ... + + diff --git a/doc/source/index.rst b/doc/source/index.rst index 8cb2774..f1109d9 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -5,7 +5,7 @@ Frappy Programming Guide :maxdepth: 2 introduction - tutorial + tutorial_helevel reference secop_psi secop_demo