Changes between Version 46 and Version 47 of SourceCodeGit

Timestamp:

Nov 10, 2014, 7:05:31 AM (10 years ago)

Author:

Eric Myers

Comment:

Examples of how to compare the local repo to the remote master, and how to pull changes from the remote into the local, so as to keep up to date with the developers.

SourceCodeGit

@@ -33 +33 @@
 using the appropriate git command - without
 needing to contact the Git repository server again as all the history can be found under 'boinc/.git'.
-This is called 'checking out'. 
-
-Run `git status` to see whether there are any changes relative to the HEAD of the 'remote master branch':
-
-{{{
-$ cd boinc
-
-$ git status
-# On branch master
-nothing to commit, working directory clean
-}}}
+This is called 'checking out'.    
+See the instructions below for checking out different branches or tags.
 
 Sometimes it is necessary to purge all untracked files created by build tools
@@ -52 +43 @@
 }}}
 
+
+=== Staying Current ===
+
+The local git repository which you created when you cloned the remote repository has a complete snapshot of development at the time it was cloned.   
+You can use this to build the BOINC software, and you can even make local changes to your local copy.
+Meanwhile the BOINC developers will be making changes to the remote repository as they continue working on the software.   
+To see what changes have been made there since you cloned the repository you must first "fetch" the changes from that repository.  
+These will go into a branch called "origin/master", which is not the current working branch of your repository (which by default will be the "master" branch).  
+So to compare your local copy with the remote, follow this example:
+{{{
+$ cd boinc
+$ git fetch
+$ git diff --name-status master..origin/master
+M       client/app.cpp
+M       client/app_config.cpp
+M       client/client_types.h
+M       client/cpu_sched.cpp
+M       client/cs_prefs.cpp
+M       client/cs_scheduler.cpp
+M       client/result.cpp
+M       client/result.h
+M       client/rr_sim.cpp
+M       client/sim.cpp
+M       clientgui/MainDocument.cpp
+M       doc/versions.inc
+M       html/user/get_passwd.php
+M       html/user/server_status.php
+M       lib/coproc.h
+}}}
+The "--name-status" flag causes only the name and status of differing files to be displayed.  
+The "master..origin/master" specification causes the difference to be displayed between your local repository (the "master" branch) and the remote repository (as fetched onto the local "origin/master" branch).
+
+If you wish to update your local branch to match the remote repository then simply use the git "pull" command,
+as in this example:
+{{{
+$ git pull
+Updating 6790085..2bb3e74
+Fast-forward
+ client/app.cpp              |   2 +-
+ client/app_config.cpp       |  12 ++
+ client/client_types.h       |   2 +-
+ client/cpu_sched.cpp        |  12 +-
+ client/cs_prefs.cpp         |   5 +-
+ client/cs_scheduler.cpp     |  15 +-
+ client/result.cpp           |   7 +-
+ client/result.h             |   3 +
+ client/rr_sim.cpp           |   4 +-
+ client/sim.cpp              |   6 +-
+ clientgui/MainDocument.cpp  |  12 +-
+ doc/versions.inc            | 380 ++++++++++++++++++++++----------------------
+ html/user/get_passwd.php    | 101 ++++++------
+ html/user/server_status.php |  38 ++++-
+ lib/coproc.h                |   5 +
+ 15 files changed, 332 insertions(+), 272 deletions(-)
+}}}
+You could also use the "git merge" command, which would merge the changes from your local copy of the "origin/master" branch into your local "master" branch.
+The "git pull" command is shorthand for "git fetch" followed immediately by "git merge".   
+
+
 == Installing Git ==
 
@@ -59 +109 @@
   (see this [SourceCodeGit/Windows guide for Windows]).
  * On Linux, Git is usually provided by your distribution.
-   If not, check your package manager and look for "git" or "git-core".
+   If it is not already installed, check your package manager and look for "git" or "git-core".
  * On Mac OS X, use [http://www.macports.org MacPorts]
    (to keep Git up to date, recommended) or a manual
@@ -67 +117 @@
    [http://gitx.laullon.com GitX] ([https://github.com/laullon/gitx latest])
 
-To get a copy of the BOINC source code you don't need to fully understand Git, just skim the instructions below.
+To get a copy of the BOINC source code you don't need to fully understand Git, you can just skim the instructions below.
 However, if you intend to modify BOINC or to look at branches, you'll need to know at least the basics.