Changes between Version 10 and Version 11 of Chimera2/git


Ignore:
Timestamp:
Apr 10, 2020, 12:16:41 AM (6 years ago)
Author:
gregc
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • Chimera2/git

    v10 v11  
    1 = Chimera 2 Revision Control =
     1= ChimeraX Revision Control =
    22
    33[[PageOutline]]
    … …  
    3333{{{#!html
    3434<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
    35 <b style="color:#c22;">franklin:~ conrad$ cd /usr/local/projects/chimera2/git</b>
    36 <b style="color:#c22;">franklin:git conrad$ git clone chimera2.git myrepo</b>
    37 Initialized empty Git repository in /usr/local/projects/chimera2/git/myrepo/.git/
     35<b style="color:#c22;">franklin:~ conrad$ cd /usr/local/projects/chimerax/git</b>
     36<b style="color:#c22;">franklin:git conrad$ git clone chimerax.git myrepo</b>
     37Initialized empty Git repository in /usr/local/projects/chimerax/git/myrepo/.git/
    3838<b style="color:#c22;">franklin:git conrad$ cd myrepo</b>
    39 /usr/local/projects/chimera2/git/myrepo
     39/usr/local/projects/chimerax/git/myrepo
    4040<b style="color:#c22;">franklin:myrepo conrad$ git flow init -d</b>
    4141Using default branch names.
    … …  
    7171<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
    7272<b style="color:#2a2;">[loft - /e]$ git clone \
    73   ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/chimera2.git \
    74   chimera2</b>
    75 Cloning into 'chimera2'...
     73  ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimerax/git/chimerax.git \
     74  chimerax</b>
     75Cloning into 'chimerax'...
    7676remote: Counting objects: 556, done.
    7777remote: Compressing objects: 100% (533/533), done.
    … …  
    7979Receiving objects: 100% (556/556), 311.17 MiB | 621 KiB/s, done.
    8080Resolving deltas: 100% (170/170), done.
    81 <b style="color:#2a2;">[loft - /e]$ cd chimera2</b>
    82 /e/chimera2
    83 <b style="color:#2a2;">[loft - /e/chimera2]$ git flow init -d</b>
     81<b style="color:#2a2;">[loft - /e]$ cd chimerax</b>
     82/e/chimerax
     83<b style="color:#2a2;">[loft - /e/chimerax]$ git flow init -d</b>
    8484Using default branch names.
    8585
    … …  
    9595Support branches? [support/]
    9696Version tag prefix? []
    97 <b style="color:#2a2;">[loft - /e/chimera2]$ ls -l</b>
     97<b style="color:#2a2;">[loft - /e/chimerax]$ ls -l</b>
    9898total 26
    9999-rw-r--r--+ 1 conrad None  657 May  3 10:51 Makefile
    … …  
    126126<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
    127127<b style="color:#c22;">franklin:myrepo conrad$ pwd</b>
    128 /usr/local/projects/chimera2/git/myrepo
     128/usr/local/projects/chimerax/git/myrepo
    129129<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
    130130# On branch develop
    … …  
    167167@@ -0,0 +1 @@
    168168+hello world
    169 <b style="color:#c22;">franklin:myrepo conrad$ echo "hello chimera2" > example</b>
     169<b style="color:#c22;">franklin:myrepo conrad$ echo "hello chimerax" > example</b>
    170170<b style="color:#c22;">franklin:myrepo conrad$ git diff</b>
    171171diff --git a/example b/example
    … …  
    175175@@ -1 +1 @@
    176176-hello world
    177 +hello chimera2
     177+hello chimerax
    178178<b style="color:#c22;">franklin:myrepo conrad$ git pull</b>
    179179Already up-to-date.
    … …  
    189189Total 3 (delta 1), reused 0 (delta 0)
    190190Unpacking objects: 100% (3/3), done.
    191 To /usr/local/projects/chimera2/git/chimera2.git
     191To /usr/local/projects/chimerax/git/chimerax.git
    192192   1d973d7..a3108a9  develop -> develop
    193193</pre>
    … …  
    206206<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
    207207<b style="color:#c22;">franklin:myrepo conrad$ pwd</b>
    208 /usr/local/projects/chimera2/git/myrepo
     208/usr/local/projects/chimerax/git/myrepo
    209209<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
    210210# On branch develop
    … …  
    222222
    223223<b style="color:#c22;">franklin:myrepo conrad$ cat example</b>
    224 hello chimera2
     224hello chimerax
    225225<b style="color:#c22;">franklin:myrepo conrad$ echo "completely different" > example</b>
    226226<b style="color:#c22;">franklin:myrepo conrad$ git status</b>
    … …  
    270270Total 7 (delta 4), reused 0 (delta 0)
    271271Unpacking objects: 100% (7/7), done.
    272 To /usr/local/projects/chimera2/git/chimera2.git
     272To /usr/local/projects/chimerax/git/chimerax.git
    273273   a3108a9..fb5b90a  develop -> develop
    274274</pre>
    … …  
    287287{{{#!html
    288288<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
    289 <b style="color:#2a2;">[loft - /e/chimera2]$ pwd</b>
    290 /e/chimera2
    291 <b style="color:#2a2;">[loft - /e/chimera2]$ git status</b>
     289<b style="color:#2a2;">[loft - /e/chimerax]$ pwd</b>
     290/e/chimerax
     291<b style="color:#2a2;">[loft - /e/chimerax]$ git status</b>
    292292# On branch develop
    293293# Changes not staged for commit:
    … …  
    298298#
    299299no changes added to commit (use "git add" and/or "git commit -a")
    300 <b style="color:#2a2;">[loft - /e/chimera2]$ echo "some changes" > example</b>
    301 <b style="color:#2a2;">[loft - /e/chimera2]$ git status</b>
     300<b style="color:#2a2;">[loft - /e/chimerax]$ echo "some changes" > example</b>
     301<b style="color:#2a2;">[loft - /e/chimerax]$ git status</b>
    302302# On branch develop
    303303# Changes not staged for commit:
    … …  
    308308#
    309309no changes added to commit (use "git add" and/or "git commit -a")
    310 <b style="color:#2a2;">[loft - /e/chimera2]$ git stash</b>
     310<b style="color:#2a2;">[loft - /e/chimerax]$ git stash</b>
    311311Saved working directory and index state WIP on develop: fb5b90a Merge branch 'feature/my_new_feature' into develop
    312312HEAD is now at fb5b90a Merge branch 'feature/my_new_feature' into develop
    313 <b style="color:#2a2;">[loft - /e/chimera2]$ cat example</b>
     313<b style="color:#2a2;">[loft - /e/chimerax]$ cat example</b>
    314314finished product
    315315<br/><i><b style="color:#d22;">Here, the developer can make and commit updates without including the earlier changes.</b></i><br/>
    316 <b style="color:#2a2;">[loft - /e/chimera2]$ git stash list</b>
     316<b style="color:#2a2;">[loft - /e/chimerax]$ git stash list</b>
    317317stash@{0}: WIP on develop: fb5b90a Merge branch 'feature/my_new_feature' into develop
    318 <b style="color:#2a2;">[loft - /e/chimera2]$ git stash pop</b>
     318<b style="color:#2a2;">[loft - /e/chimerax]$ git stash pop</b>
    319319# On branch develop
    320320# Changes not staged for commit:
    … …  
    326326no changes added to commit (use "git add" and/or "git commit -a")
    327327Dropped refs/stash@{0} (9c7ea9292cd81bd1f4d2606dbab129e3cdd5c0d9)
    328 <b style="color:#2a2;">[loft - /e/chimera2]$ cat example</b>
     328<b style="color:#2a2;">[loft - /e/chimerax]$ cat example</b>
    329329some changes
    330 <b style="color:#2a2;">[loft - /e/chimera2]$ git pull</b>
     330<b style="color:#2a2;">[loft - /e/chimerax]$ git pull</b>
    331331Already up-to-date.
    332332</pre>
    … …  
    348348{{{#!html
    349349<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
    350 <b style="color:#22c;">conrad@huck ~$ git clone ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo myrepo</b>
     350<b style="color:#22c;">conrad@huck ~$ git clone ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimerax/git/myrepo myrepo</b>
    351351Cloning into 'myrepo'...
    352352remote: Counting objects: 569, done.
    … …  
    399399Writing objects: 100% (3/3), 283 bytes, done.
    400400Total 3 (delta 1), reused 1 (delta 0)
    401 To ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo
     401To ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimerax/git/myrepo
    402402 * [new branch]      feature/multi_site -> feature/multi_site
    403403Already on 'feature/multi_site'
    … …  
    410410<i><b style="color:#2a2;">Subsequently, on another host...</b></i>
    411411
    412 <b style="color:#2a2;">[loft - ~]$ git clone ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo myrepo</b>
     412<b style="color:#2a2;">[loft - ~]$ git clone ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimerax/git/myrepo myrepo</b>
    413413Cloning into 'myrepo'...
    414414remote: Counting objects: 569, done.
    … …  
    454454Writing objects: 100% (3/3), 279 bytes, done.
    455455Total 3 (delta 1), reused 0 (delta 0)
    456 To ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo
     456To ssh://conrad@plato.cgl.ucsf.edu/usr/local/projects/chimerax/git/myrepo
    457457   da70383..f9d8a3d  feature/multi_site -> feature/multi_site
    458458
    … …  
    464464remote: Total 3 (delta 1), reused 0 (delta 0)
    465465Unpacking objects: 100% (3/3), done.
    466 From ssh://plato.cgl.ucsf.edu/usr/local/projects/chimera2/git/myrepo
     466From ssh://plato.cgl.ucsf.edu/usr/local/projects/chimerax/git/myrepo
    467467   da70383..f9d8a3d  feature/multi_site -> origin/feature/multi_site
    468468Updating da70383..f9d8a3d
    … …  
    497497== Create Team Repository ==
    498498
    499 In this section, examples refer to ''/var/tmp/conrad/example'' since the actual path ''/usr/local/projects/chimera2/git'' is already in use.  Examples in other sections of this document refer to the correct path.
    500 
    501 Create the bare '''git''' repository that will serve as the team repository for Chimera 2 source code.  Note that the repository is created for sharing within a group.  The '''chgrp''' command defines which group will have cloning and update privileges.  The access permissions such as the setgid bit of directories (meaning files created will inherit the group of the parent directory) in the repository is maintained by '''git''' and should not require manual intervention.
     499In this section, examples refer to ''/var/tmp/conrad/example'' since the actual path ''/usr/local/projects/chimerax/git'' is already in use.  Examples in other sections of this document refer to the correct path.
     500
     501Create the bare '''git''' repository that will serve as the team repository for ChimeraX source code.  Note that the repository is created for sharing within a group.  The '''chgrp''' command defines which group will have cloning and update privileges.  The access permissions such as the setgid bit of directories (meaning files created will inherit the group of the parent directory) in the repository is maintained by '''git''' and should not require manual intervention.
    502502
    503503{{{#!html
    504504<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
    505505<b style="color:#c22;">franklin:example conrad$ cd /var/tmp/conrad/example</b>
    506 <b style="color:#c22;">franklin:example conrad$ git init --bare --shared=group chimera2.git</b>
    507 Initialized empty shared Git repository in /var/tmp/conrad/example/chimera2.git/
    508 <b style="color:#c22;">franklin:example conrad$ chgrp -R chimdev chimera2.git</b>
     506<b style="color:#c22;">franklin:example conrad$ git init --bare --shared=group chimerax.git</b>
     507Initialized empty shared Git repository in /var/tmp/conrad/example/chimerax.git/
     508<b style="color:#c22;">franklin:example conrad$ chgrp -R chimdev chimerax.git</b>
    509509<b style="color:#c22;">franklin:example conrad$ ls -l</b>
    510510total 4
    511 drwxrwsr-x 7 conrad chimdev 3864 May  1 09:34 chimera2.git/
     511drwxrwsr-x 7 conrad chimdev 3864 May  1 09:34 chimerax.git/
    512512</pre>
    513513}}}
    … …  
    517517{{{#!html
    518518<pre style="margin-left:20px; margin-right:20px; border:solid 1px; padding:3px; background:white;">
    519 <b style="color:#c22;">franklin:example conrad$ git clone --shared chimera2.git bootstrap</b>
     519<b style="color:#c22;">franklin:example conrad$ git clone --shared chimerax.git bootstrap</b>
    520520Initialized empty Git repository in /var/tmp/conrad/example/bootstrap/.git/
    521521warning: You appear to have cloned an empty repository.
    … …  
    530530}}}
    531531
    532 Use '''git flow''' to set up the branches in the bootstrap repository.  After initialization, we are on the '''develop''' branch where we add our initial files; '''xyzzy''' is our only file in this example.  The '''add -A''' command adds all modified and untracked files to the staging area; the '''commit''' command commits files in the staging area to the local repository; the '''push''' command pushes the state of the current branch from the local repository, '''bootstrap''', to the remote team repository, '''origin''', which represents the repository from which we are cloned ('''chimera2.git''' in this case).
     532Use '''git flow''' to set up the branches in the bootstrap repository.  After initialization, we are on the '''develop''' branch where we add our initial files; '''xyzzy''' is our only file in this example.  The '''add -A''' command adds all modified and untracked files to the staging area; the '''commit''' command commits files in the staging area to the local repository; the '''push''' command pushes the state of the current branch from the local repository, '''bootstrap''', to the remote team repository, '''origin''', which represents the repository from which we are cloned ('''chimerax.git''' in this case).
    533533
    534534{{{#!html
    … …  
    569569Total 5 (delta 0), reused 0 (delta 0)
    570570Unpacking objects: 100% (5/5), done.
    571 To /var/tmp/conrad/example/chimera2.git
     571To /var/tmp/conrad/example/chimerax.git
    572572 * [new branch]      develop -> develop
    573573</pre>
    … …  
    589589<b style="color:#c22;">franklin:bootstrap conrad$ git push origin master</b>
    590590Total 0 (delta 0), reused 0 (delta 0)
    591 To /var/tmp/conrad/example/chimera2.git
     591To /var/tmp/conrad/example/chimerax.git
    592592 * [new branch]      master -> master
    593593</pre>
    594594}}}
    595595
    596 At this point, the team repository set up is complete.  All the files are under revision control and the bootstrap repository may be safely deleted.  The team repository, '''chimera2.git''', with '''master''' and '''develop''' branches, is ready for by developers.  Note that developers still have to set up and use '''git flow''' after cloning in order to follow the [http://nvie.com/posts/a-successful-git-branching-model/ Vincent Driessen's branching model] conveniently.
     596At this point, the team repository set up is complete.  All the files are under revision control and the bootstrap repository may be safely deleted.  The team repository, '''chimerax.git''', with '''master''' and '''develop''' branches, is ready for by developers.  Note that developers still have to set up and use '''git flow''' after cloning in order to follow the [http://nvie.com/posts/a-successful-git-branching-model/ Vincent Driessen's branching model] conveniently.
    597597
    598598{{{#!html
    … …  
    602602total 12
    603603drwxr-xr-x 3 conrad ferrin  3864 May  1 11:19 bootstrap/
    604 drwxrwsr-x 7 conrad chimdev 3864 May  1 09:34 chimera2.git/
     604drwxrwsr-x 7 conrad chimdev 3864 May  1 09:34 chimerax.git/
    605605<b style="color:#c22;">franklin:example conrad$ rm -rf bootstrap</b>
    606606</pre>