[alsa-devel] HG vs GIT

[Takashi Iwai]

At Thu, 7 Feb 2008 07:49:39 -0800 (PST),
Trent Piepho wrote:
> 
> On Thu, 7 Feb 2008, Takashi Iwai wrote:
> > At Thu, 7 Feb 2008 14:52:43 +0100 (CET),
> > > > > How do I test the driver if it's compiled with the kernel in the alsa.git
> > > > > tree?  I want to compile the driver against the kernel I'm running now.
> > > >
> > > > Well, I don't get your point.  "git-pull alsa.git" onto your current
> > > > kernel tree and make.  Then you have the latest ALSA drivers for your
> > > > current system...
> > >
> > > Pull cannot be used. You'll pull also Linus's changes in tree with this
> > > command (which might not be wanted).
> >
> > Ah, OK, I didn't think that your current tree is behind the ALSA
> > tree.  But surely there must be an easy way to do that.  At easiest,
> > I'd make a diff of alsa-git.tree to the upstream and apply it over the
> > local tree.
> 
> It would have to be behind the current tree, unless you reboot multiple
> times per day.

What a shame :)

> The problem with an out of tree codebase extracted from git (or Hg), is
> that once extracted you couldn't use ALSA's SCM on it.  E.g., generating
> nice patches based on current head, or pulling and merging recent patches
> in with your current work.

It's possible to extract and merge patches nicely with git.  I just
pointed the "easiest" way to get the latest code.  There must be a
better way.


Takashi