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: 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.
WARNING: multiple messages have this Message-ID (diff)
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: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-05-20 11:21 HG -> GIT migration Jaroslav Kysela
2008-05-20 14:12 ` Ben Stanley
2008-05-20 14:24 ` Jaroslav Kysela
2008-05-21 2:30 ` Eliot Blennerhassett
2008-05-21 6:09 ` Jaroslav Kysela
2008-05-21 10:28 ` Takashi Iwai
2008-05-21 12:30 ` Rene Herman
2008-05-21 12:37 ` Takashi Iwai
2008-05-21 13:04 ` Rene Herman
2008-05-21 13:04 ` [alsa-devel] " Rene Herman
2008-05-21 13:48 ` Jaroslav Kysela
2008-05-21 14:40 ` Rene Herman
2008-05-21 14:40 ` [alsa-devel] " Rene Herman
2008-05-21 14:52 ` Takashi Iwai
2008-05-21 14:52 ` [alsa-devel] " Takashi Iwai
2008-05-21 15:29 ` Rene Herman
2008-05-21 15:29 ` [alsa-devel] " Rene Herman
2008-05-22 1:24 ` Stephen Rothwell
2008-05-22 20:43 ` Rene Herman
2008-05-22 20:43 ` [alsa-devel] " Rene Herman
2008-05-22 23:40 ` Stephen Rothwell
2008-05-22 23:40 ` [alsa-devel] " Stephen Rothwell
2008-05-21 14:47 ` Takashi Iwai
2008-05-21 14:47 ` [alsa-devel] " Takashi Iwai
2008-05-21 15:40 ` Rene Herman [this message]
2008-05-21 15:40 ` Rene Herman
2008-05-21 16:02 ` Takashi Iwai
2008-05-21 16:02 ` [alsa-devel] " Takashi Iwai
2008-05-21 16:16 ` Linus Torvalds
2008-05-21 16:51 ` Takashi Iwai
2008-05-21 16:51 ` [alsa-devel] " Takashi Iwai
2008-05-21 17:07 ` Tobin Davis
2008-05-21 17:19 ` Jaroslav Kysela
2008-05-21 17:22 ` Rene Herman
2008-05-21 17:43 ` [alsa-devel] " Linus Torvalds
2008-05-21 18:11 ` Linus Torvalds
2008-05-21 18:11 ` [alsa-devel] " Linus Torvalds
2008-05-21 18:25 ` david
2008-05-21 18:39 ` Linus Torvalds
2008-05-21 18:39 ` [alsa-devel] " Linus Torvalds
2008-05-21 18:49 ` Takashi Iwai
2008-05-21 18:49 ` [alsa-devel] " Takashi Iwai
2008-05-21 18:47 ` Takashi Iwai
2008-05-21 18:47 ` [alsa-devel] " Takashi Iwai
2008-05-21 19:02 ` Linus Torvalds
2008-05-21 19:02 ` [alsa-devel] " Linus Torvalds
2008-05-21 21:08 ` Takashi Iwai
2008-05-21 21:08 ` [alsa-devel] " Takashi Iwai
2008-05-22 14:23 ` Dmitry Torokhov
2008-05-21 22:16 ` Eliot Blennerhassett
2008-05-23 2:31 ` Ben Stanley
2008-05-23 6:38 ` Jaroslav Kysela
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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.