[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 following page has been changed by SteffenMoeller:
http://wiki.debian.org/BOINC/Development/GitUsage

The comment on the change is:
Explaining more on pristine-tar.

------------------------------------------------------------------------------
   * upstream
   * pristine-tar
  A list of branches available on the server is made visible with
+ 
  {{{
  git branch -r}}}
  ----
- The programs that are referred to in the following paragraphs are contained in the Debian packages: [http://packages.debian.org/git-core git-core] [http://packages.debian.org/git-buildpackage git-buildpackage] [http://packages.debian.org/git-svn git-svn] [http://packages.debian.org/pristine-tar pristine-tar]
+  The programs that are referred to in the following paragraphs are contained in the Debian packages: [http://packages.debian.org/git-core git-core] [http://packages.debian.org/git-buildpackage git-buildpackage] [http://packages.debian.org/git-svn git-svn] [http://packages.debian.org/pristine-tar pristine-tar]
  
  [[Anchor(AccessingRepositories)]]
  
@@ -51, +52 @@

  {{{
  pristine-tar checkout boinc_6.2.18.orig.tar.gz
  }}}
- ''Frank, please add some words on what is actually happening here.''
+ This pristine-tar is some magic on its own. The idea is to share upstream's resources and have them nicely integrated with the git and git-buildpackage functionalities. See this link http://www.eyrie.org/~eagle/notes/debian/git.html for a nice summary on what is going on.
  
- To find out which tarballs can be regenerated with {{{pristine-tar}}} run:
+ To find out which tarballs can be regenerated with the tool{{{ pristine-tar}}}, check out what files there are in the branch with the same name:
  
  {{{
  git ls-tree pristine-tar
@@ -63, +64 @@

  {{{
  git checkout master
  }}}
+ There will now many file be appearing that will no longer be seen when you checkout the pristine-tar branch again. The concept is that git shows only those files that are assigned to the current branch, that have been already present when the branch was created, or that are assigned to no branch at all.  Thus, once you compile the code, all the object files belong to no branch and will stay even when you go to the pristine-tar branch again. This is somewhat annoying at times.
+ 
  [[Anchor(BuildingPackages)]]
  
  == Building packages ==
@@ -79, +82 @@

  [[Anchor(TrackingUpstream)]]
  
  == Uploading local changes to the servers ==
- 
  Every new idea worked at under git is prepared as a separate branch. This may for instance be a bug that is fixed. The branches currently existing on the servers seem sufficient. If you are a not a regular contributor, and even if you are, please consider to discuss the preparation of new branches with Rene and/or possibly Thomas. The idea previously prepared is then merged with the local representation of the server's branches.
  
  {{{
@@ -98, +100 @@

  git push origin
  }}}
  If you don't need your branch any more then you can delete it with
+ 
  {{{
  git branch -D myIdeaToTest
  }}}
- 
  This way, the changes are done to the respective branch, not to the master. Changes to the latter would impose their applicability across all possible versions of boinc. If the idea of yours that is represented by the branch would be applicable, then merge it from multiple branches, i.e. from debian/etch and debian/sarge, prior to deleting it.
  
  == Tracking upstream development ==
@@ -113, +115 @@

  This creates a new remote branch {{{git-svn/upstream/trunk}}} which contains BOINC's complete trunk.
  
  == Misc ==
+ It is at times confusing with all those many branches. To show that info directly on the shell, consider to add the following to the .profile or .bashrc (found at http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/):
  
- It is at times confusing with all those many branches. To show that info directly on the shell, consider to add the following to the .profile or .bashrc (found at http://techblog.floorplanner.com/2008/12/14/working-with-git-branches/):
  {{{
  parse_git_branch() {
    git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ \[\1\]/'
  }
- 
  export PS1="\[\033[01;37m\]${debian_chroot:+($debian_chroot)}\u@\h:\w\[\033[00;35m\]$(parse_git_branch)\[\033[00m\] \$"
  }}}