Changes between Version 7 and Version 8 of Chimera2/git

Timestamp:

May 6, 2013, 4:13:18 PM (13 years ago)

Author:

Conrad Huang

Comment:

--

Chimera2/git

@@ -6 +6 @@
 
 The remainder of this document describes some common tasks using '''git'''.  ''plato'' refers to the Linux cluster on which the team repository is stored.  ''franklin'' is the name of a node in the plato cluster.
+
+== Initializing ''git'' Parameters ==
+
+Before using '''git''' repositories, it is a good idea to set the account and e-mail names that will be recorded.  For example, my '''git''' parameters are set with:
+
+{{{#!html
+<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
+$ git config --global user.name "Conrad Huang"
+$ git config --global user.email conrad@cgl.ucsf.edu
+}}}
 
 == Cloning a Developer Repository ==
@@ -328 +338 @@
 Obviously, the coordinating repository does not need to reside on plato.  However, it should be on a host that remains accessible from the network at all times so that changes may be pushed or pulled.
 
-The main thing to remember is that any branch that is being used in this coordinated fashion should be set up properly using
- - '''git push''' ''remote_name branch_name''
-and
- - '''git branch --set-upstream''' ''branch_name remote_name/branch_name''
-where ''remote_name'' is the '''git''' name for the coordinating repository.  If the remote repositories are cloned from the coordinating repository, then the standard name ''origin'' may be used.
+In the example below, the '''myrepo''' repository on plato is cloned on host '''huck''' (a host at work).  A shared feature branch, '''multi_site''', is created as is a source file '''shared'''.  The feature branch is pushed to '''plato''' using '''git flow feature publish'''.  Afterwards, the '''plato''' repository is cloned on '''loft''' (a host at home).  The feature branch is initialized using '''git flow feature pull'''.  Once the feature branch exists on both hosts, the normal '''push''' and '''pull''' command from '''git''' may be used to synchronized the repositories.
+
+{{{#!html
+<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
+<b style="color:#22c;">conrad@huck ~$ git clone ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo myrepo</b>
+Cloning into 'myrepo'...
+remote: Counting objects: 569, done.
+remote: Compressing objects: 100% (542/542), done.
+remote: Total 569 (delta 175), reused 276 (delta 16)
+Receiving objects: 100% (569/569), 311.17 MiB | 20.57 MiB/s, done.
+Resolving deltas: 100% (175/175), done.
+<b style="color:#22c;">conrad@huck ~/myrepo$ git checkout master</b>
+Branch master set up to track remote branch master from origin.
+Switched to a new branch 'master'
+<b style="color:#22c;">conrad@huck ~/myrepo$ git flow init -d</b>
+Using default branch names.
+
+Which branch should be used for bringing forth production releases?
+   - develop
+   - master
+Branch name for production releases: [master]
+
+Which branch should be used for integration of the "next release"?
+   - develop
+Branch name for "next release" development: [develop]
+
+How to name your supporting branch prefixes?
+Feature branches? [feature/]
+Release branches? [release/]
+Hotfix branches? [hotfix/]
+Support branches? [support/]
+Version tag prefix? []
+<b style="color:#22c;">conrad@huck ~/myrepo$ git flow feature start multi_site</b>
+Switched to a new branch 'feature/multi_site'
+
+Summary of actions:
+- A new branch 'feature/multi_site' was created, based on 'develop'
+- You are now on branch 'feature/multi_site'
+
+Now, start committing on your feature. When done, use:
+
+     git flow feature finish multi_site
+
+<b style="color:#22c;">conrad@huck ~/myrepo$ echo "shared code" > shared</b>
+<b style="color:#22c;">conrad@huck ~/myrepo$ git add shared</b>
+<b style="color:#22c;">conrad@huck ~/myrepo$ git commit -m "shared code" shared</b>
+[feature/multi_site da70383] shared code
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+ create mode 100644 shared
+<b style="color:#22c;">conrad@huck ~/myrepo$ git flow feature publish multi_site</b>
+Counting objects: 4, done.
+Delta compression using up to 8 threads.
+Compressing objects: 100% (2/2), done.
+Writing objects: 100% (3/3), 283 bytes, done.
+Total 3 (delta 1), reused 1 (delta 0)
+To ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo
+ * [new branch]      feature/multi_site -> feature/multi_site
+Already on 'feature/multi_site'
+
+Summary of actions:
+- A new remote branch 'feature/multi_site' was created
+- The local branch 'feature/multi_site' was configured to track the remote branch
+- You are now on branch 'feature/multi_site'
+
+<i><b style="color:#2a2;">Subsequently, on another host...</b></i>
+
+<b style="color:#2a2;">[loft - ~]$ git clone ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo myrepo</b>
+Cloning into 'myrepo'...
+remote: Counting objects: 569, done.
+remote: Compressing objects: 100% (542/542), done.
+Receiving objectsremote: Total 569 (delta 175), reused 276 (delta 16)
+Receiving objects: 100% (569/569), 311.17 MiB | 586 KiB/s, done.
+Resolving deltas: 100% (175/175), done.
+<b style="color:#2a2;">[loft - ~]$ cd myrepo/</b>
+/e/home/conrad/myrepo
+<b style="color:#2a2;">[loft - ~/myrepo]$ git checkout master</b>
+Branch master set up to track remote branch master from origin.
+Switched to a new branch 'master'
+<b style="color:#2a2;">[loft - ~/myrepo]$ git flow init -d</b>
+Using default branch names.
+
+Which branch should be used for bringing forth production releases?
+   - develop
+   - master
+Branch name for production releases: [master]
+
+Which branch should be used for integration of the "next release"?
+   - develop
+Branch name for "next release" development: [develop]
+
+How to name your supporting branch prefixes?
+Feature branches? [feature/]
+Release branches? [release/]
+Hotfix branches? [hotfix/]
+Support branches? [support/]
+Version tag prefix? []
+<b style="color:#2a2;">[loft - ~/myrepo]$ git flow feature pull origin multi_site</b>
+Created local branch feature/multi_site based on origin's feature/multi_site.
+<b style="color:#2a2;">[loft - ~/myrepo]$ cat shared</b>
+shared code
+<b style="color:#2a2;">[loft - ~/myrepo]$ echo "more shared code" >> shared</b>
+<b style="color:#2a2;">[loft - ~/myrepo]$ git commit -a -m "more code added"</b>
+<b style="color:#2a2;">[feature/multi_site f9d8a3d] more code added
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+[loft - ~/myrepo]$ git push</b>
+Counting objects: 5, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (2/2), done.
+Writing objects: 100% (3/3), 279 bytes, done.
+Total 3 (delta 1), reused 0 (delta 0)
+To ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo
+   da70383..f9d8a3d  feature/multi_site -> feature/multi_site
+
+<i><b style="color:#22c;">Back to the first host...</b></i>
+
+<b style="color:#22c;">conrad@huck ~/myrepo$ git pull</b>
+remote: Counting objects: 5, done.
+remote: Compressing objects: 100% (2/2), done.
+remote: Total 3 (delta 1), reused 0 (delta 0)
+Unpacking objects: 100% (3/3), done.
+From ssh://plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo
+   da70383..f9d8a3d  feature/multi_site -> origin/feature/multi_site
+Updating da70383..f9d8a3d
+Fast-forward
+ shared |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+<b style="color:#22c;">conrad@huck ~/myrepo$ cat shared</b>
+shared code
+more shared code
+
+</pre>
+}}}
 
 == Create Team Repository ==