- A single git reset ORIG_HEAD recovers from a conflicting merge
handling conflicts is a big part of a maintainer's job!
Because you are a driver maintainer.
That's what's different here from regular merge.
Please understand: we have upstream code and we have changes against it.
Upstream
hi michael, ...
On Wed, Jul 25, 2007 at 10:27:23AM +0300, Michael S. Tsirkin wrote:
- A single git reset ORIG_HEAD recovers from a conflicting merge
handling conflicts is a big part of a maintainer's job!
Because you are a driver maintainer.
That's what's different here from regular
also, if the upstream
changes touch code that conflicts with a backport
patch, you get to fix the problem as it happens
That's exactly the thing that I do not want to do.
you don't want to know about a problem a patch
until days or weeks later when the auto build
keeps failing
hi michael, ...
On Tue, Jul 24, 2007 at 06:03:41AM +0300, Michael S. Tsirkin wrote:
[...]
But I also see a serious problem with addressing: basically
git tracks content. It's not designed to track a bush
of branches taken together. For example, take tagging:
tag namespace is global, so you
Quoting Arthur Jones [EMAIL PROTECTED]:
Subject: Re: [ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits
hi michael, ...
On Tue, Jul 24, 2007 at 06:03:41AM +0300, Michael S. Tsirkin wrote:
[...]
But I also see a serious problem with addressing: basically
git tracks content.
hi michael, ...
On Tue, Jul 24, 2007 at 06:09:09PM +0300, Michael S. Tsirkin wrote:
Quoting Arthur Jones [EMAIL PROTECTED]:
Subject: Re: [ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits
hi michael, ...
On Tue, Jul 24, 2007 at 06:03:41AM +0300, Michael S. Tsirkin wrote:
Quoting Arthur Jones [EMAIL PROTECTED]:
Subject: Re: [ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits
hi michael, ...
On Tue, Jul 24, 2007 at 06:32:28PM +0300, Michael S. Tsirkin wrote:
[...]
For example, git pull can only merge one branch at a time.
how is this a
Quoting Arthur Jones [EMAIL PROTECTED]:
Subject: Re: [ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits
hi michael, ...
On Tue, Jul 24, 2007 at 06:09:09PM +0300, Michael S. Tsirkin wrote:
Quoting Arthur Jones [EMAIL PROTECTED]:
Subject: Re: [ofa-general] ANNOUNCE ofed
hi michael, ...
On Tue, Jul 24, 2007 at 06:53:48PM +0300, Michael S. Tsirkin wrote:
[...]
well, no, i _have_ been doing development on the
local branches in our internal repo. i also
merge in changes that you make to the ofed repo
to our internal backport branches. the script
i
Because you only have your driver to maintain.
no, i have to maintain quite a few of the
ofed backport branches as well for our release.
if i started getting pull requests from people
with changes to 15 backport branches in one go,
i'd probably want to script it...
Yea. Happens all the
hi michael, ...
On Tue, Jul 24, 2007 at 08:19:24PM +0300, Michael S. Tsirkin wrote:
i realize that you're attached to your current method,
but i've _used_ a different method, and i can say from
experience that it works _much_ better...
I'd like to see a clean method, that doesn't replace
i'd _really_ like to see a list of the advantages of
patches over branches. it's hard for me to know if
i'm just missing something if the case is not laid out...
Here's a short list off the top of my head
- A single git pull merges any number of backport changes
- A single git reset
Quoting Sean Hefty [EMAIL PROTECTED]:
Subject: Re: [ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits
Here's a short list off the top of my head
- A single git pull merges any number of backport changes
- A single git reset ORIG_HEAD recovers from a conflicting merge
- A single
hi michael, ...
On Tue, Jul 24, 2007 at 08:52:20PM +0300, Michael S. Tsirkin wrote:
i'd _really_ like to see a list of the advantages of
patches over branches. it's hard for me to know if
i'm just missing something if the case is not laid out...
thanks for the list...
Here's a short
hi michael, ...
On Tue, Jun 12, 2007 at 11:41:08AM +0300, Michael S. Tsirkin wrote:
For whom it may concern,
I have created an ofed git tree updated with kernel bits from 2.6.22-rc4,
and put that up at git://git.openfabrics.org/~mst/ofed_kernel.git
[...]
In particular, there were a ton of
Quoting Arthur Jones [EMAIL PROTECTED]:
Subject: Re: [ofa-general] ANNOUNCE ofed backports for 2.6.22 kernel bits
hi michael, ...
On Tue, Jun 12, 2007 at 11:41:08AM +0300, Michael S. Tsirkin wrote:
For whom it may concern,
I have created an ofed git tree updated with kernel bits from
Erez Zilber wrote:
Erez, and other iser maintainers, I had a problem with RHEL4 iscsi backports
(scsi_flush_work isn't exported) I decided that since it isn't
called on older kernels it's reasonably safe to just comment it out,
but would be interested to hear you opinion.
See it in this
17 matches
Mail list logo
