On 08/02/2011 03:15, sf...@users.sourceforge.net wrote:
> 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.
....
Aha, I see. Actually, that's not what I thought you were doing, but I
understand now.
OK, so the process I am seeking is actually something more like a full
set of commits from upstream kernel, but mixed in are my patches and
merges where needed.
The closest I found so far is to fork my branch, apply my patches, then
rebase the kernel tree *onto* my tree (and fix any merge conflicts where
necessary). This gives something which looks like the original kernel
tree, but with my patches mixed in... Slight fiddle to do though...
Ideas on a better solution?
> 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.
I have one of these in my current laptop and it absolutely screams:
http://www.ebuyer.com/product/225806
If you can help me find the same or similar drive locally to you for
around the same price I would consider donating one to you?
Kind regards
Ed W
------------------------------------------------------------------------------
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
