A.S. After toying with git some more, I revised the recommended
instructions to follow the mirror(s)
apt-get install git-core
git clone git://git.cuci.nl/pike
cd pike
git gc
git branch -r # List available active remote branches
# dead branches are available as
# tags (like: 7.5 or ulpc.old)
git checkout -f origin/7.7
git branch -f master # This creates your own development
# branch called "master"
# tracking official version 7.7
git checkout -f master
git log master
git log origin/7.7
git log origin/7.6
git log origin/7.4
Now edit around, and commit changes using:
git commit -a -m "Some useful one-line-description"
and repeat as often as needed (of course).
In order to update the mirror from upstream (my repository, where you
cloned from), simply run:
git fetch
every once in a while.
After doing so, perform:
git rebase origin/7.7
to actually move forward your own "master"-branch changes so they are
automatically merged and (re)based onto the latest (official) updates from 7.7
Pushing back the changes into the official release involves using CVS
(externally from git) still. The native git mechanisms cannot be used
for that until the official repository is also changed to git.
The nice thing about git is that merges from the developmentbranch back into
older stable branches are seemless and fully annotated. These
advantages however, cannot be used until git is used natively.
In theory, the merges could be retro-fitted into the branches, but there
currently is no automated way of doing that to the existing tree (it can
be done manually, git allows all kinds of "afterward fixing").
-------------------------------------
For Roxen/Caudium/Chilimoon, try the above with:
git clone git://git.cuci.nl/roxen
git branch -r
Then pick either:
origin/5.0 # for Roxen development branch
origin/caudium # for Caudium development branch
origin/chilimoon # for Chilimoon development branch
--
Sincerely, <srb[at]cuci.nl>
Stephen R. van den Berg (AKA BuGless).
"Good moaning!"
|