<span style='font-family:Verdana'><span style='font-size:12px'><span style="font-family:verdana;"><span style="font-size:12px;">Hello,<br />
<br />
much in line with my previous email to the list I have not pushed my local branches to the pkg-boinc git repository on alioth. This is what I did:<br />
<br />
* clone Berkeley's BOINC git repository, master branch only<br />
* rename master branch to </span></span>'upstream-master-direct<span style="font-family:verdana;"><span style="font-size:12px;">'<br />
* branch from there to '</span></span>upstream-master-clean'<br />
* git rm all files that our export-boinc script would have excluded and commit<br />
* git branch clean_with_debian, leave it for now<br />
* create new orphan branch 'debian-folder-release' and copy the debian folder of our pkg-boinc/boinc.git master branch into it<br />
* branch from it 'debian-folder-HEAD'<br />
* change it to produce a working boinc-server-maker package again<br />
* git checkout clean_with_debian<br />
* git merge debian-folder-HEAD<br />
* git remote add alioth git+ssh://git.debian.org/git/pkg-boinc/boinc.git<br />
* git push --set-upstream alioth debian-folder-HEAD<br />
* and analogously the other four branches<br />
<br />
So, the pkg-boinc alioth repository now has the branches<br />
$ git branch -r --list alioth*<br />
alioth/SZTAKI<br />
alioth/SZTAKI_templates(<br />
alioth/backports/squeeze<br />
alioth/clean_with_debian * new *<br />
alioth/debian-folder-HEAD * new *<br />
alioth/debian-folder-release * new *<br />
alioth/debian/backports/etch<br />
alioth/debian/backports/hardy<br />
alioth/debian/backports/jaunty<br />
alioth/debian/backports/sarge<br />
alioth/master<br />
alioth/more-ldadd<br />
alioth/pristine-tar<br />
alioth/sid<br />
alioth/upstream<br />
alioth/upstream-master-cleaned * new *<br />
alioth/upstream-master-direct * new *<br />
<br />
The branch master is the equivalent of the branch clean_with_debian, just with the prior working for the release upstream versions and the clean_with_debian with the very latest of upstream. The first is created from a tarfile as one blob, the second is a regular git clone and - incrementally updateable.<br />
<br />
For using those branches with an existing pkg-boinc/boinc.git checkout, one would perform the usual<br />
git checkout -b clean_with_debian origin/clean_with_debian<br />
git checkout -b debian-folder-HEAD origin/debian-folder-HEAD<br />
<br />
to perform an update of the BOINC upstream sources, it would be<br />
git remote add berkeley git://boinc.berkeley.edu/boinc.git<br />
git checkout -b upstream-master-direct berkeley/master<br />
git checkout -b upstream-master-cleaned alioth/upstream-master-cleaned<br />
git merge upstream-master-direct<br />
git checkout clean_with_debian<br />
git merge upstream-master-cleaned<br />
# perform changes on debian/*<br />
git stash<br />
git checkout debian-folder-HEAD<br />
git stash pop<br />
git commit -m "description" -a<br />
# pushes to alioth of what has been changed<br />
<br />
I personally feel that this is a good leap forward to smoothen our interaction with about everyone else. <br />
<br />
Concerning Gianfranco's concern about his PPA builds demanding the branch from which to build featuring the name "master", I think it is just fine. to branch from upstream-master-direct/clean with a branch called master and merge debian-folder-release to it. Changes done to the debian-folder-release branch will just be merged to debian-folder-HEAD.<br />
<br />
Comments?<br />
<br />
Steffen<br />
<br />
<br />
<br />
Steffen<br />
<br />
<br />
<br />
</span></span>