From: Takashi Iwai <tiwai@suse•de>
To: Nico -telmich- Schottelius <nico-linux-next@schottelius•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>, linux-next@vger•kernel.org
Subject: Re: How to debug linux-next?
Date: Thu, 31 Jul 2008 17:58:46 +0200 [thread overview]
Message-ID: <s5h7ib2kpu1.wl%tiwai@suse.de> (raw)
In-Reply-To: <20080731144111.GA4291@denkbrett.schottelius.org>
At Thu, 31 Jul 2008 16:41:11 +0200,
Nico -telmich- Schottelius wrote:
>
> > > - And would a non-rebased tree not make life much easier for debugging
> > > purposes?
> >
> > I don't know. What it would do is produce a lot more merge conflicts as
> > patches are moved around, changed, removed etc on a daily basis.
>
> The only issue I see is with rewritten patches. Otherwise git-merge
> should detect already applied patches and without git I see
> git-format-patch and git-am as quite strong tools.
>
> I must confess, that I _really_ like the idea of doing
> git-fetch && git-merge linux-next, so git-bisect works
> for all versions.
I also would love to have a continuous git tree, but I guess it's
pretty hard for linux-next after some time. git-merge doesn't always
track rebased trees perfectly, and we have also quilt trees in
addition. Moreover, sometimes some subtrees have to be dropped
temporarily for fatal conflicts.
One thing I think sometimes useful is a record of HEAD of each merged
tree in a file, say, Next/heads. Then you can see what changes have
been done in each subtree more easily.
BTW, you can try to merge the tree by yourself. For example, starting
from next-20080729, merge next-20080730, resolve conflicts manually,
and go next to 20080731. It seems working with a relatively small
number of conflicts for a few days difference.
Takashi
next prev parent reply other threads:[~2008-07-31 15:58 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-31 12:56 xorg problems with v2.6.27-rc1-2457-gdcb80fd Nico -telmich- Schottelius
2008-07-31 13:23 ` How to debug linux-next? (was: Re: xorg problems with v2.6.27-rc1-2457-gdcb80fd) Nico -telmich- Schottelius
2008-07-31 13:35 ` Stephen Rothwell
2008-07-31 14:41 ` How to debug linux-next? Nico -telmich- Schottelius
2008-07-31 15:58 ` Takashi Iwai [this message]
2008-07-31 16:09 ` Nico -telmich- Schottelius
2008-07-31 16:36 ` Takashi Iwai
2008-07-31 16:54 ` Nico -telmich- Schottelius
2008-07-31 16:59 ` Takashi Iwai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=s5h7ib2kpu1.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=nico-linux-next@schottelius$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox