Hi Ed,
Ed W:
> I'm looking at maintaining some merged kernel patches from a variety of
> projects and looking at using git to do so. If you don't mind me
> asking, can you briefly describe how you use git to maintain aufs and
> any gotchas/tips you have discovered while using git for this?
:::
I am using git-pull mainly.
As you know, there are two aufs2 GIT trees, aufs2-2.6.git and
aufs2-standalone.git.
Mostly the updates are made in aufs2-2.6.git. And aufs2-standalone.git
inherits them.
"master" branch in aufs2-2.6.git is equivalent to mainline.
$ git co master
$ git pull
"aufs2.1" branch inherits all of these changes.
$ git co aufs2.1
$ git pull . master
This is what I am doing every week.
For the version-ed branches "aufs2.1-XX", create the branch, and
inherits the changes made in the previous version.
$ git co -b aufs2.1-XX v2.6.XX
$ git co aufs2.1-XX
$ git pull . aufs2.1-(XX-1)
Currently the mainline is developing 2.6.38. So "aufs2.1" branch
corresponds to .38.
$ git co aufs2.1
$ git pull . aufs2.1-37
Aufs2.1 supports .31 and later. When I add a new feature to aufs2.1, I
make a change in aufs2.1-31. And the change will be inherited by git
pull. This git-pull is done for every branch repeatedly.
$ git co aufs2.1-31
(edit files)
$ git ci
$ git co aufs2.1-32
$ git pull . aufs2.1-31
:::
$ git co aufs2.1-37
$ git pull . aufs2.1-36
$ git co aufs2.1
$ git pull . aufs2.1-37
If you run "git log fs/aufs" in "aufs2.1" branch, you will see lots of
commits titled like these.
Merge branch 'aufs2.1-36' into aufs2.1-37
Merge branch 'aufs2.1-35' into aufs2.1-36
Merge branch 'aufs2.1-34' into aufs2.1-35
Is this answer enough for you?
Or do you want to know how I generate aufs2-standalone?
By the way, to have such many branches and switching them every day is
very heavy work for me and my small 512M fanless PC, and it takes very
long time. In last summer, yes it was very hot, the temperture of my HDD
have exceeded 60C. Most of time it is 55C or 56C.
Generally people says "high temperture damages HDD" and I am afraid when
my HDD will die. Actually it becomes slower. Especially when I turn on
the power, HDD becomes to make sounds like a "click" many times for
about a minute.
I am afraid I have to buy a new fanless PC which have internal SDD and
eSATA interface and a external raid10 box with a cooling fan.
J. R. Okajima
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
