Difference between revisions of "Release Details"

From Einstein Toolkit Documentation
Jump to: navigation, search
Line 12: Line 12:
  
 
<h2>Creating and working with git branches</h2>
 
<h2>Creating and working with git branches</h2>
 
Some basic git commands to create and work with branches:
 
 
Check in your local repository which branch you are in:
 
 
%git branch
 
* master
 
 
Check the branches of your project in the remote repository:
 
 
%git branch -r
 
  origin/HEAD
 
  origin/master
 
 
Create a new branch called test:
 
 
%git checkout -b test
 
Switched to a new branch "test"
 
%git branch 
 
  master
 
* test
 
 
Work on files in that branch:
 
 
%vi test.txt
 
 
Verify the status of files you modified in that branch:
 
 
%git status
 
  # On branch test
 
  # Untracked files:
 
  #  (use "git add <file>..." to include in what will be committed)
 
  #
 
  #      test.txt
 
  nothing added to commit but untracked files present (use "git add" to track)
 
 
Add the file(s) edited to the git stage area:
 
 
%git add test.txt
 
%git status
 
  # On branch test
 
  # Changes to be committed:
 
  #  (use "git reset HEAD <file>..." to unstage)
 
  #
 
  #      new file:  test.txt
 
  #
 
 
Commit your changes to your local repository:
 
 
%git commit -m "test file only"
 
  Created commit 14644af: test file only
 
  1 files changed, 1 insertions(+), 0 deletions(-)
 
  create mode 100644 test.txt
 
 
Now you want to push these changes to a remote repository that you have
 
writing permission:
 
 
%git push origin test
 
 
Note however that, unless git is configured so, your local branch of "test"
 
does not track any changes committed by others to the remote branch "test".
 
Maybe the simplest way to proceed then is just to delete your local branch:
 
 
%git branch -D test
 
Deleted branch test.
 
 
and checkout the remote branch you just created but letting git know you want
 
to track remote changes to that branch as well:
 
 
%git checkout --track -b test origin/test
 
 
You may want to see how two branches differ or how your modifications of the
 
branch compare to the HEAD of the branch, for example. Suppose you just
 
added the test.txt file to the staged git area called the index. To know
 
the difference between the index and the HEAD, essentially what would be
 
committed if 'git commit' is issued, just use git diff as follows:
 
 
%git diff  --cached
 
  diff --git a/test.txt b/test.txt
 
  new file mode 100644
 
  index 0000000..373c7b0
 
  --- /dev/null
 
  +++ b/test.txt
 
  @@ -0,0 +1 @@
 
  +Hello, world!
 
  
 
<h2>Release Plan</h2>
 
<h2>Release Plan</h2>

Revision as of 18:55, 17 June 2010

Tools/Links

  • The release branch name will be ET_2010_06
  • Testsuite Status page (add the testsuite *.log files created by scripts below to the repository at [1] to have them automatically included)
  • Scripts to compile and run testsuites on different machines

Creating and working with git branches

Release Plan

TaskDue dateResponsibleStatus
(Re)run Testsuitesnumrel as necessaryFrank
philip as necessaryFrank
queenbeeas necessaryFrank
ranger as necessaryTanja
kraken as necessaryIan
pelican as necessaryFrankdropped
damiana as necessaryIan
bluedropas necessaryPeter√ (down for Jun 17th)
redshiftas necessaryErik
Fix TestsuitesDistortedBHIVP/E2xeon_test_dbh fails on LONIJun 15Frank
Exact/Schwarzschild_EF fails on LONI Jun 15Frank
QuasiLocalMeasures/all fail Jun 15Eloisa
WeylScal4/teukolsky fails Jun 15Peter
Add TestsuitesMcLachlanJun 15Ian
Check & Improve Documentation (www, wiki)Jun 16Bruno, Tanja
Write announcement texts Jun 16Gabrielle
Create release branchsvn.einsteintoolkit.orgJun 16Frank
svn.cactuscode.org Jun 16Frank
carpetcode.org Jun 16Erik
aei.mpg.de Jun 16Ian
cvs.cct.lsu.edu Jun 16Franknot needed anymore
svn.cct.lsu.edu Jun 16Frank
github.com/ianhinder/Kranc.gitJun 16Ian

Release team

  • Gabrielle Allen
  • Frank Löffler
  • Erik Schnetter