|
|
This creates a branch named "osx-redirect" and checks it out.
|
|
|
|
|
|
```ppmmro02:OpenSimRoot pmzmro$ git checkout -b osx-redirect
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git checkout -b osx-redirect
|
|
|
M OpenSimRoot/tests/engine/testEngine.sh
|
|
|
M OpenSimRoot/tests/modules/testModules.sh
|
|
|
Switched to a new branch 'osx-redirect'
|
|
|
ppmmro02:OpenSimRoot pmzmro$```
|
|
|
ppmmro02:OpenSimRoot pmzmro$
|
|
|
```
|
|
|
|
|
|
This is equivalent to "git branch osx-redirect" followed by "git checkout osx-redirect".
|
|
|
|
|
|
This web page was useful: https://www.atlassian.com/git/tutorials/learn-git-with-bitbucket-cloud/git-branch-to-merge
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git status
|
|
|
On branch osx-redirect
|
|
|
Changes not staged for commit:
|
|
|
(use "git add <file>..." to update what will be committed)
|
|
|
(use "git checkout -- <file>..." to discard changes in working directory)
|
|
|
|
|
|
modified: OpenSimRoot/tests/engine/testEngine.sh
|
|
|
modified: OpenSimRoot/tests/modules/testModules.sh
|
|
|
|
|
|
Untracked files:
|
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
|
|
.DS_Store
|
|
|
OpenSimRoot/.DS_Store
|
|
|
OpenSimRoot/StaticBuild/OpenSimRoot
|
|
|
OpenSimRoot/StaticBuild/phosphorus000.00.vtu
|
|
|
OpenSimRoot/StaticBuild/phosphorus001.00.vtu
|
|
|
...
|
|
|
OpenSimRoot/tests/engine/.DS_Store
|
|
|
OpenSimRoot/tests/engine/testResults/
|
|
|
OpenSimRoot/tests/modules/.DS_Store
|
|
|
OpenSimRoot/tests/modules/testResults/
|
|
|
|
|
|
no changes added to commit (use "git add" and/or "git commit -a")
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git add OpenSimRoot/tests/engine/testEngine.sh
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git add OpenSimRoot/tests/modules/testModules.sh
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git status
|
|
|
On branch osx-redirect
|
|
|
Changes to be committed:
|
|
|
(use "git reset HEAD <file>..." to unstage)
|
|
|
|
|
|
modified: OpenSimRoot/tests/engine/testEngine.sh
|
|
|
modified: OpenSimRoot/tests/modules/testModules.sh
|
|
|
|
|
|
Untracked files:
|
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
|
|
.DS_Store
|
|
|
OpenSimRoot/.DS_Store
|
|
|
OpenSimRoot/StaticBuild/OpenSimRoot
|
|
|
OpenSimRoot/StaticBuild/phosphorus000.00.vtu
|
|
|
OpenSimRoot/StaticBuild/phosphorus001.00.vtu
|
|
|
...
|
|
|
OpenSimRoot/tests/.DS_Store
|
|
|
OpenSimRoot/tests/engine/.DS_Store
|
|
|
OpenSimRoot/tests/engine/testResults/
|
|
|
OpenSimRoot/tests/modules/.DS_Store
|
|
|
OpenSimRoot/tests/modules/testResults/
|
|
|
|
|
|
ppmmro02:OpenSimRoot pmzmro$
|
|
|
```
|
|
|
|
|
|
Use "git diff HEAD" to see what has changed:
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git diff HEAD
|
|
|
diff --git a/OpenSimRoot/tests/engine/testEngine.sh b/OpenSimRoot/tests/engine/testEngine.sh
|
|
|
index e7fcde8..13e4983 100755
|
|
|
--- a/OpenSimRoot/tests/engine/testEngine.sh
|
|
|
+++ b/OpenSimRoot/tests/engine/testEngine.sh
|
|
|
@@ -13,29 +13,29 @@ fi
|
|
|
[ -e ../$exe ] && echo using $exe as exe || { echo exe $exe not found ; exit 1 ; }
|
|
|
|
|
|
|
|
|
-../$exe ../SimulaConstant.xml &> screen.out || echo "Test SimulaConstant.xml failed" && echo "Test SimulaConstant.xml passed"
|
|
|
+../$exe ../SimulaConstant.xml > screen.out 2>&1 || echo "Test SimulaConstant.xml failed" && echo "Test SimulaConstant.xml passed"
|
|
|
mv tabled_output.tab ResultSimulaConstant.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsSimulaConstant.txt
|
|
|
|
|
|
-../$exe ../SimulaTable.xml &>> screen.out || echo "Test SimulaTable.xml failed" && echo "Test SimulaTable.xml passed"
|
|
|
+../$exe ../SimulaTable.xml >> screen.out 2>&1 || echo "Test SimulaTable.xml failed" && echo "Test SimulaTable.xml passed"
|
|
|
[ -e /usr/bin/Rscripts ] && cat tabled_output.tab | grep -v path | ../../../scripts/plot -qo SimulaTable
|
|
|
mv tabled_output.tab ResultSimulaTable.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsSimulaTable.txt
|
|
|
|
|
|
-../$exe ../SimulaGrid.xml &>> screen.out || echo "Test SimulaGrid.xml failed" && echo "Test SimulaGrid.xml passed"
|
|
|
+../$exe ../SimulaGrid.xml >> screen.out 2>&1 || echo "Test SimulaGrid.xml failed" && echo "Test SimulaGrid.xml passed"
|
|
|
mv tabled_output.tab ResultSimulaGrid.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsSimulaGrid.txt
|
|
|
|
|
|
-../$exe ../SimulaVariable.xml &>> screen.out || echo "Test SimulaVariable.xml failed" && echo "Test SimulaVariable.xml passed"
|
|
|
+../$exe ../SimulaVariable.xml >> screen.out 2>&1 || echo "Test SimulaVariable.xml failed" && echo "Test SimulaVariable.xml passed"
|
|
|
[ -e /usr/bin/Rscripts ] && cat tabled_output.tab | grep RGRModel | grep -v multi | grep -v Rate | ../../../scripts/plot -qo SimulaVariable
|
|
|
mv tabled_output.tab ResultSimulaVariable.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsSimulaVariable.txt
|
|
|
|
|
|
-../$exe ../SimulaPoint.xml &>> screen.out || echo "Test SimulaPoint.xml failed" && echo "Test SimulaPoint.xml passed"
|
|
|
+../$exe ../SimulaPoint.xml >> screen.out 2>&1 || echo "Test SimulaPoint.xml failed" && echo "Test SimulaPoint.xml passed"
|
|
|
mv modelDump010.00.xml ResultSimulaPoint.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsSimulaPoint.txt
|
|
|
|
|
|
-../$exe ../SimulaStochastic.xml &>> screen.out || echo "Test SimulaStochastic.xml failed" && echo "Test SimulaStochastic.xml passed"
|
|
|
+../$exe ../SimulaStochastic.xml >> screen.out 2>&1 || echo "Test SimulaStochastic.xml failed" && echo "Test SimulaStochastic.xml passed"
|
|
|
[ -e /usr/bin/Rscripts ] && ../SimulaStochastic.R
|
|
|
mv tabled_output.tab ResultSimulaStochastic.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsSimulaStochastic.txt
|
|
|
diff --git a/OpenSimRoot/tests/modules/testModules.sh b/OpenSimRoot/tests/modules/testModules.sh
|
|
|
index c323ac5..bf4ddd0 100755
|
|
|
--- a/OpenSimRoot/tests/modules/testModules.sh
|
|
|
+++ b/OpenSimRoot/tests/modules/testModules.sh
|
|
|
@@ -14,13 +14,13 @@ fi
|
|
|
|
|
|
[ -e ../$exe ] && echo using $exe as exe || { echo exe $exe not found ; exit 1 ; }
|
|
|
|
|
|
-../$exe ../OneSimpleStraightRoot.xml &> screen.out && echo "Test OneSimpleStraightRoot.xml passed" || echo "Test OneSimpleStraightRoot.xml failed"
|
|
|
+../$exe ../OneSimpleStraightRoot.xml > screen.out 2>&1 && echo "Test OneSimpleStraightRoot.xml passed" || echo "Test OneSimpleStraightRoot.xml failed"
|
|
|
mv tabled_output.tab ResultOneSimpleStraightRoot.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsOneSimpleStraightRoot.txt
|
|
|
mv roots010.00.vtu roots010.00.OneSimpleStraightRoot.vtu 2>/dev/null
|
|
|
mv roots010.00.vtp roots010.00.OneSimpleStraightRoot.vtp 2>/dev/null
|
|
|
|
|
|
-../$exe ../PartiallyPredefinedBranchedRoot.xml &>> screen.out && echo "Test PartiallyPredefinedBranchedRoot.xml passed" || echo "Test PartiallyPredefinedBranchedRoot.xml failed"
|
|
|
+../$exe ../PartiallyPredefinedBranchedRoot.xml >> screen.out 2>&1 && echo "Test PartiallyPredefinedBranchedRoot.xml passed" || echo "Test PartiallyPredefinedBranchedRoot.xml failed"
|
|
|
#[ -e /usr/bin/Rscripts ] && cat tabled_output.tab | grep -v path | ../../../scripts/plot -qo PartiallyPredefinedBranchedRoot
|
|
|
mv tabled_output.tab ResultPartiallyPredefinedBranchedRoot.xml.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsPartiallyPredefinedBranchedRoot.xml.txt
|
|
|
@@ -28,11 +28,11 @@ grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsPartia
|
|
|
#mv roots_rasterImage_014.00.vti ResultPartiallyPredefinedBranchedRoot.vti
|
|
|
mv roots014.00.vtp ResultPartiallyPredefinedBranchedRoot.xml.vtp 2>/dev/null
|
|
|
|
|
|
-../$exe ../Barber-Cushman.xml &>> screen.out && echo "Test Barber-Cushman.xml passed" || echo "Test Barber-Cushman.xml failed"
|
|
|
+../$exe ../Barber-Cushman.xml >> screen.out 2>&1 && echo "Test Barber-Cushman.xml passed" || echo "Test Barber-Cushman.xml failed"
|
|
|
mv tabled_output.tab ResultBarber-Cushman.xml.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsBarber-Cushman.xml.txt
|
|
|
|
|
|
-../$exe ../SimpleCropModel.xml &>> screen.out && echo "Test SimpleCropModel.xml passed" || echo "Test SimpleCropModel.xml failed"
|
|
|
+../$exe ../SimpleCropModel.xml >> screen.out 2>&1 && echo "Test SimpleCropModel.xml passed" || echo "Test SimpleCropModel.xml failed"
|
|
|
mv tabled_output.tab ResultSimpleCropModel.xml.tab 2>/dev/null
|
|
|
grep -v "Simulation took (hours:minutes:seconds)" warnings.txt &> WarningsSimpleCropModel.xml.txt
|
|
|
|
|
|
ppmmro02:OpenSimRoot pmzmro$
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git commit -m "Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX"
|
|
|
[osx-redirect ba37b15] Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX
|
|
|
Committer: Markus Owen <pmzmro@ppmmro02.maths.nottingham.ac.uk>
|
|
|
Your name and email address were configured automatically based
|
|
|
on your username and hostname. Please check that they are accurate.
|
|
|
You can suppress this message by setting them explicitly. Run the
|
|
|
following command and follow the instructions in your editor to edit
|
|
|
your configuration file:
|
|
|
|
|
|
git config --global --edit
|
|
|
|
|
|
After doing this, you may fix the identity used for this commit with:
|
|
|
|
|
|
git commit --amend --reset-author
|
|
|
|
|
|
2 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
```
|
|
|
|
|
|
```
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git commit -m "Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX"
|
|
|
[osx-redirect ba37b15] Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX
|
|
|
Committer: Markus Owen <pmzmro@ppmmro02.maths.nottingham.ac.uk>
|
|
|
Your name and email address were configured automatically based
|
|
|
on your username and hostname. Please check that they are accurate.
|
|
|
You can suppress this message by setting them explicitly. Run the
|
|
|
following command and follow the instructions in your editor to edit
|
|
|
your configuration file:
|
|
|
|
|
|
git config --global --edit
|
|
|
|
|
|
After doing this, you may fix the identity used for this commit with:
|
|
|
|
|
|
git commit --amend --reset-author
|
|
|
|
|
|
2 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git config --global --edit
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git config --global user.email markus.owen@nottingham.ac.uk
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git commit --amend --reset-author
|
|
|
[osx-redirect 725cfbb] Committing changes to test scripts that change the way stdout and stderr are redirected to be compatible with Mac OSX
|
|
|
2 files changed, 10 insertions(+), 10 deletions(-)
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git status
|
|
|
On branch osx-redirect
|
|
|
Untracked files:
|
|
|
(use "git add <file>..." to include in what will be committed)
|
|
|
|
|
|
.DS_Store
|
|
|
OpenSimRoot/.DS_Store
|
|
|
OpenSimRoot/StaticBuild/OpenSimRoot
|
|
|
OpenSimRoot/StaticBuild/phosphorus000.00.vtu
|
|
|
OpenSimRoot/StaticBuild/phosphorus001.00.vtu
|
|
|
...
|
|
|
OpenSimRoot/tests/.DS_Store
|
|
|
OpenSimRoot/tests/engine/.DS_Store
|
|
|
OpenSimRoot/tests/engine/testResults/
|
|
|
OpenSimRoot/tests/modules/.DS_Store
|
|
|
OpenSimRoot/tests/modules/testResults/
|
|
|
|
|
|
nothing added to commit but untracked files present (use "git add" to track)
|
|
|
ppmmro02:OpenSimRoot pmzmro$ git push origin osx-redirect
|
|
|
Counting objects: 8, done.
|
|
|
Delta compression using up to 4 threads.
|
|
|
Compressing objects: 100% (8/8), done.
|
|
|
Writing objects: 100% (8/8), 775 bytes | 0 bytes/s, done.
|
|
|
Total 8 (delta 6), reused 0 (delta 0)
|
|
|
remote:
|
|
|
remote: Create merge request for osx-redirect:
|
|
|
remote: https://gitlab.com/rootmodels/OpenSimRoot/merge_requests/new?merge_request%5Bsource_branch%5D=osx-redirect
|
|
|
remote:
|
|
|
To git@gitlab.com:rootmodels/OpenSimRoot.git
|
|
|
* [new branch] osx-redirect -> osx-redirect
|
|
|
ppmmro02:OpenSimRoot pmzmro$
|
|
|
``` |
|
|
\ No newline at end of file |