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

Debian Wiki debian-www at lists.debian.org
Tue Mar 30 23:38:11 UTC 2010


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=21&rev2=22

  git clone git://git.debian.org/git/pkg-boinc/<package>.git
  cd *boinc*
  }}}
+ 
+ That directory includes all the source code already, and it even shows a debian directory, all information seems available:
+ 
+ {{{
+ $ ls                                 
+ api                     checkin_notes_samples  db           
+ apps                    client                 debian     
+ _autosetup              clientctrl             depcomp    
+ bolt_checkin_notes.txt  clientgui              doc
+ [...]
+ }}}
+ 
+ However, we are interested in the differences between that "everything we need locally" master and the original upstream version. git is very good at determine such differences, i.e. we just need another branch, ''upstream'' to keep the original. And when the original updates, one can just merge the master branch with it.
+ 
  <<Anchor(RegeneratingTarballs)>>
  
  == Regenerating upstream tarballs ==
@@ -42, +56 @@

  {{{
  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. Normally, one would branch from the local msater, i.e. one adds or changes a series of files relative to what is already available. The "origin/" prefix above informs git to branch from the remote side, i.e. a completely new environment is established that is independent from the previously checked out code:
+ {{{
+ $ ls
+ boinc_6.2.14.orig.tar.gz.delta  boinc_6.2.18.orig.tar.gz.id    boinc_6.6.10.orig.tar.gz.delta
+ boinc_6.2.14.orig.tar.gz.id     boinc_6.4.5.orig.tar.gz.delta  boinc_6.6.10.orig.tar.gz.id
+ boinc_6.2.18.orig.tar.gz.delta  boinc_6.4.5.orig.tar.gz.id
+ }}}
+ All other files disappear.
+ The new branch will is listed next to the previously cloned master branch:
  {{{
  git branch
  }}}



More information about the pkg-boinc-commits mailing list