[Debian Wiki] Update of "BOINC/Development/GitUsage" by SteffenMoeller

[Debian Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Debian Wiki" for change notification.

The "BOINC/Development/GitUsage" page has been changed by SteffenMoeller:
http://wiki.debian.org/BOINC/Development/GitUsage?action=diff&rev1=26&rev2=27

  
  == Overview ==
  
- The general workflow for using the repository is to first have all upstream code in the collaboratively maintained remote branch 'upstream'. One then checks out the branch one wants to work with for performing the Debian packaging (maybe 'master') and merges all of upstream into it. Git-buildpackage will then perform the building.
+ The general workflow for using the repository is to first have all upstream code in the collaboratively maintained remote branch 'upstream'. Several parallel efforts are kept on the server. The one last uploaded is always in the branch 'master'. One checks out the branch one wants to work with for performing the Debian packaging (maybe 'master') and merges all of upstream into it. Git-buildpackage will then perform the building.
  
  == Branches ==
  
- When packaging with git, both the Debian packaging sources ''and'' the upstream sources are stored in the archive. And when, like we are, one is using git-buildpackage, some default names for the different components should be respected to keep the argument list short.
+ When packaging with git, both the Debian packaging sources ''and'' the upstream sources are stored in the archive. And when, like we are, one is using git-buildpackage, then some default names for the different components should be respected to keep the argument list short.
  
   * upstream - the branch holding the upstream sources
   * master - the branch holding the Debian directory that shall be packaged, one must have checked this one out when invoking git-buildpackage
@@ -26, +26 @@

  
  And there is this special branch here
   * pristine-tar
- which is not really required if one is only interested in the very latest source tree (as we are for boinc) but which plays into our hands once we support many different versions. Let's ignore this for now.
+ which is not really required if one is only interested in the very latest source tree (as we are for boinc) but which plays into our hands once we support many different versions. Let's ignore this for now but find the 'pristine-tar' section below at a later time.
  
  After a first checkout of the repository (cloning in git terminology, described below) a list of branches available on the server is made visible with
  
@@ -113, +113 @@

  {{{
  git ls-tree pristine-tar
  }}}
+ 
+ === Update the 'upstream' branch ===
+ 
+ It is fairly likely that the latest branch in the upstream branch is older than the one we would like to work with. Upstream should then be updated. There are several ways to achieve that. Here the traditional way, which is the most intuitive (for the old folks here).
+ 
+ 1. check out the source code with the right tag of the latest version. As explained in the debian/README.source, [http://git.debian.org/?p=pkg-boinc/scripts.git;a=blob_plain;f=export-boinc;hb=HEAD|this script] performs the checkout for us and removes some non-DFSG compatible material.
+ 1. {{{git checkout upstream}}}
+ 1. {{{git-import-orig ../boinc_6.10.44.orig.tar.gz}}}.
+ 
+ 
  To switch back to the master branch, we now check out our own local master branch:
  
  {{{