[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

------------------------------------------------------------------------------
  #language en
- 
  This page is work in progress. It should describe the layout of pkg-boinc's Git repositories.
  
   * master
@@ -11, +10 @@

   * debian/fb/<feature>
   * 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)]]
+ 
  == Accessing repositories ==
+ Check out the source of package ''<package>'' with:
  
- Check out the source of package ''<package>'' with:
  {{{
  git clone ssh://<alioth-login>@git.debian.org/git/pkg-boinc/<package>.git
  }}}
- where <package> is one of 'boinc', 'boinc-app-seti' and 'kboincspy' as inspectable via [http://git.debian.org].
+ where <package> is one of 'boinc', 'boinc-app-seti' and 'kboincspy' as inspectable via http://git.debian.org.
  
  If you do not have an Alioth account, you can check out the repositories read-only:
+ 
  {{{
  git clone git://git.debian.org/git/pkg-boinc/<package>.git
  }}}
+ [[Anchor(RegeneratingTarballs)]]
  
- [[Anchor(RegeneratingTarballs)]]
  == Regenerating upstream tarballs ==
+ Upstream {{{.orig.tar.gz}}} tarballs can be regenerated with the {{{pristine-tar}}} tool directly from the repositories. To do so create a local {{{pristine-tar}}} branch from the remote {{{origin/pristine-tar}}} branch first:
  
- Upstream `.orig.tar.gz` tarballs can be regenerated with the `pristine-tar` tool directly from the repositories. To do so create a local `pristine-tar` branch from the remote `origin/pristine-tar` branch first:
  {{{
  git checkout -b pristine-tar origin/pristine-tar
  }}}
+ As a clarification to those new to git, when cloning, the  source of our clone is referred to as "origin". The "checkout" when given the "-b" option creates a new branch, which happens to have the same as the branch on the git server. The new branch will then be listed next to the previously cloned master branch:
+ 
- As a clarification to those new to git, when cloning, the 
- source of our clone is referred to as "origin". The "checkout"
- when given the "-b" option creates a new branch, which happens
- to have the same as the branch on the git server. The new branch
- will then be listed next to the previously cloned master branch:
  {{{
  git branch
  }}}
+ Now to regenerate for example the {{{boinc_6.2.18.orig.tar.gz}}} tarball from the {{{boinc}}} repository run:
  
- Now to regenerate for example the `boinc_6.2.18.orig.tar.gz` tarball from the `boinc` repository run:
  {{{
  pristine-tar checkout boinc_6.2.18.orig.tar.gz
  }}}
  ''Frank, please add some words on what is actually happening here.''
  
- To find out which tarballs can be regenerated with `pristine-tar` run:
+ To find out which tarballs can be regenerated with {{{pristine-tar}}} run:
+ 
  {{{
  git ls-tree pristine-tar
  }}}
+ To switch back to the master branch, we now check out our own local master branch:
  
- To switch back to the master branch, we now check out our own local master branch:
  {{{
  git checkout master
  }}}
+ [[Anchor(BuildingPackages)]]
  
- [[Anchor(BuildingPackages)]]
  == Building packages ==
+ Building packages with {{{git-buildpackage}}} is now as easy as running:
  
- Building packages with `git-buildpackage` is now as easy as running:
  {{{
  git buildpackage --git-pristine-tar
  }}}
- or if you already have the `.orig.tar.gz` tarball in ''<path/to/tarballs/>'':
+ or if you already have the {{{.orig.tar.gz}}} tarball in ''<path/to/tarballs/>'':
+ 
  {{{
  git buildpackage --git-tarball-dir=<path/to/tarballs/>
  }}}
+ [[Anchor(TrackingUpstream)]]
  
- [[Anchor(TrackingUpstream)]]
  == Tracking upstream development ==
+ With {{{git-svn}}} upstream development can be directly tracked in your Git repository. For example if you are in the {{{boinc}}} repository, run the following command to clone BOINC's {{{trunk}}} from upstream's Subversion repository into your Git repository:
  
- With `git-svn` upstream development can be directly tracked in your Git repository. For example if you are in the `boinc` repository, run the following command to clone BOINC's `trunk` from upstream's Subversion repository into your Git repository:
  {{{
  git svn clone --trunk=trunk/boinc --prefix=git-svn/upstream/ http://boinc.berkeley.edu/svn/ .
  }}}
- This creates a new remote branch `git-svn/upstream/trunk` which contains BOINC's complete trunk.
+ This creates a new remote branch {{{git-svn/upstream/trunk}}} which contains BOINC's complete trunk.