From: Rene Herman <rene.herman@keyaccess.nl>
To: Takashi Iwai <tiwai@suse.de>
Cc: alsa-devel@alsa-project.org,
Linus Torvalds <torvalds@linux-foundation.org>,
Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Re: [alsa-devel] HG -> GIT migration
Date: Wed, 21 May 2008 17:40:33 +0200 [thread overview]
Message-ID: <48344271.3090700@keyaccess.nl> (raw)
In-Reply-To: <s5habijww7r.wl%tiwai@suse.de>
On 21-05-08 16:47, Takashi Iwai wrote:
> Theoretically we can work only using merges. However, the resultant
> tree will look too complex with lots of merge points at the time of
> the next merge window. This is also a nightmare for bisecting. Thus,
> most subsystem trees do rebase before the merge window in practice,
> AFAIK.
>
> It'd be appreciated if someone can tell me any good workflow to keep a
> good-shaped tree without rebasing...
Over here:
http://lkml.org/lkml/2008/5/17/203
Linus suggests to just not do many merges from upstream -- basically
only at releases.
I'm only looking at and experiencing things from the limited viewpoint
of a leaf node though so I'll shut up for a bit first now as this might
not be helpful.
Rene.
next prev parent reply other threads:[~2008-05-21 15:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <Pine.LNX.4.61.0805201314190.1798@tm8103-a.perex-int.cz>
[not found] ` <200805211430.06653.linux@audioscience.com>
[not found] ` <Pine.LNX.4.61.0805210805080.1798@tm8103-a.perex-int.cz>
[not found] ` <s5hve18vtml.wl%tiwai@suse.de>
[not found] ` <483415E7.5080402@keyaccess.nl>
[not found] ` <s5hfxsbx27f.wl%tiwai@suse.de>
2008-05-21 13:04 ` [alsa-devel] HG -> GIT migration Rene Herman
2008-05-21 13:48 ` Jaroslav Kysela
2008-05-21 14:40 ` Rene Herman
2008-05-21 14:52 ` Takashi Iwai
2008-05-21 15:29 ` Rene Herman
2008-05-22 1:24 ` Stephen Rothwell
2008-05-22 20:43 ` Rene Herman
2008-05-22 23:40 ` Stephen Rothwell
2008-05-21 14:47 ` Takashi Iwai
2008-05-21 15:40 ` Rene Herman [this message]
2008-05-21 16:02 ` Takashi Iwai
2008-05-21 16:16 ` Linus Torvalds
2008-05-21 16:51 ` Takashi Iwai
2008-05-21 17:43 ` Linus Torvalds
2008-05-21 18:11 ` Linus Torvalds
2008-05-21 18:25 ` david
2008-05-21 18:39 ` Linus Torvalds
2008-05-21 18:49 ` Takashi Iwai
2008-05-21 18:47 ` Takashi Iwai
2008-05-21 19:02 ` Linus Torvalds
2008-05-21 21:08 ` Takashi Iwai
2008-05-22 14:23 ` Dmitry Torokhov
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=48344271.3090700@keyaccess.nl \
--to=rene.herman@keyaccess.nl \
--cc=alsa-devel@alsa-project.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tiwai@suse.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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