My Way to play with master and 5.1 branches

   1 [SHELL] mkdir ~/repositories
   2 [SHELL] cd ~/repositories
   3 
   4 # master branch
   5 # =======================================================
   6 [SHELL] git clone git@git.scilab.org:scilab master
   7 
   8 
   9 # 5.1 branch
  10 # =======================================================
  11 [SHELL] git clone git@git.scilab.org:scilab 5.1
  12 [SHELL] cd 5.1
  13   # Create a local 5.1 branch
  14 [SHELL] git branch 5.1 refs/remotes/origin/5.1
  15   # CheckOut this branch
  16 [SHELL] git checkout 5.1
  17   # We don't need the master branch in this repository anymore :
  18 [SHELL] git branch -D master
  19 

   1 # master branch
   2 # =======================================================
   3 [SHELL] cd ~/repositories/master/scilab
   4 [SHELL] svn --force export svn://svn.scilab.org/scilab/trunk/Dev-Tools/SE/Prerequirements/Linux/bin bin
   5 [SHELL] svn --force export svn://svn.scilab.org/scilab/trunk/Dev-Tools/SE/Prerequirements/Linux/thirdparty thirdparty
   6 [SHELL] svn --force export svn://svn.scilab.org/scilab/trunk/Dev-Tools/SE/Prerequirements/Linux/libs libs
   7 [SHELL] ./configure
   8 [SHELL] make all
   9 
  10 # 5.1 branch
  11 # =======================================================
  12 [SHELL] cd ~/repositories/5.1/scilab
  13 [SHELL] svn --force export svn://svn.scilab.org/scilab/branches/5.1/Dev-Tools/SE/Prerequirements/Linux/bin bin
  14 [SHELL] svn --force export svn://svn.scilab.org/scilab/branches/5.1/Dev-Tools/SE/Prerequirements/Linux/thirdparty thirdparty
  15 [SHELL] svn --force export svn://svn.scilab.org/scilab/branches/5.1/Dev-Tools/SE/Prerequirements/Linux/libs libs
  16 [SHELL] ./configure
  17 [SHELL] make all

   1 [SHELL] cd ~/repositories/5.1
   2 
   3   # Just check the branch
   4 [SHELL] git branch
   5 .* 5.1
   6 
   7   # Edit The guilty file
   8 [SHELL] nano scilab/modules/compatibility_functions/help/fr_FR/mtlb_sort.xml
   9 
  10   # Add the file to list of item to commit
  11 [SHELL] git add scilab/modules/compatibility_functions/help/fr_FR/mtlb_sort.xml 
  12 
  13   # Commit it
  14 [SHELL] git commit -m 'Fix accented characters'
  15 .Created commit 065bdd6: Fix accented characters
  16 . 1 files changed, 1 insertions(+), 1 deletions(-)
  17 
  18   # Send the commit to the server
  19 [SHELL] git push
  20 .Counting objects: 15, done.
  21 .Compressing objects: 100% (8/8), done.
  22 .Writing objects: 100% (8/8), 643 bytes, done.
  23 .Total 8 (delta 6), reused 0 (delta 0)
  24 .-Info-         Update is fast-forward
  25 .-Info-         The user is: 'pierre.marechal@scilab.org'
  26 .-Grant-                Granting access based on authz
  27 .To git@git.scilab.org:scilab
  28 .   38e8d08..065bdd6  5.1 -> 5.1
  29 
  30   # Now merge the 5.1 branch with master branch
  31 [SHELL] cd ~/repositories/master
  32 
  33   # Update your "master" repository
  34 [SHELL]  git pull
  35 .remote: Counting objects: 15, done.
  36 .remote: Compressing objects: 100% (8/8), done.
  37 .remote: Total 8 (delta 6), reused 0 (delta 0)
  38 .Unpacking objects: 100% (8/8), done.
  39 .From git@git.scilab.org:scilab
  40 .   38e8d08..065bdd6  5.1        -> origin/5.1
  41 .Already up-to-date.
  42 
  43   # And now, The Merge
  44 [SHELL] git merge refs/remotes/origin/5.1
  45 .Merge made by recursive.
  46 . .../help/fr_FR/mtlb_sort.xml                       |    2 +-
  47 . 1 files changed, 1 insertions(+), 1 deletions(-)
  48 
  49   # Check the commits
  50 [SHELL] git log -n 2
  51 .commit c8c1e14ece3b2dfec4f6c3412dbbdccf9a37f574
  52 .Merge: f7210ff... 065bdd6...
  53 .Author: Pierre MARECHAL <pierre.marechal@scilab.org>
  54 .Date:   Wed Dec 3 10:51:53 2008 +0100
  55 .
  56 .    Merge commit 'refs/remotes/origin/5.1'
  57 .
  58 .commit 065bdd66900f4091e9b3479e524ddc529c4281f8
  59 .Author: Pierre MARECHAL <pierre.marechal@scilab.org>
  60 .Date:   Wed Dec 3 10:43:19 2008 +0100
  61 .
  62 .    Fix accented characters
  63 
  64 
  65   # Send the commit to the server
  66 [SHELL] git push 
  67 .Counting objects: 13, done.
  68 .Compressing objects: 100% (5/5), done.
  69 .Writing objects: 100% (5/5), 500 bytes, done.
  70 .Total 5 (delta 4), reused 0 (delta 0)
  71 .-Info-         Update is fast-forward
  72 .-Info-         The user is: 'pierre.marechal@scilab.org'
  73 .-Grant-                Granting access based on authz
  74 .To git@git.scilab.org:scilab
  75 .   f7210ff..c8c1e14  master -> master
  76 .