Re: [GIT PATCHES for 2.6.30] V4L/DVB updates

From: Mauro Carvalho Chehab
Date: Mon Apr 06 2009 - 21:31:21 EST



On Mon, 6 Apr 2009 18:11:34 -0700 (PDT)
Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:

>
>
> On Mon, 6 Apr 2009, Mauro Carvalho Chehab wrote:
> >
> > Please pull from:
> > ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6.git for_linus
>
> Have you rebased your tree and pushed out multiple versions of it?
>
> I'm getting very confusing things from the mirrors, which are subtly
> different from the copy on master.
>
> This all looks like it was rebased just hours ago, and to top it off, it
> looks like you actually change stuff you had exported earlier.
>
> Don't do that. Really. It's very annoying. More than annoying, in fact.
> This had better simply not happen again!

Yes, unfortunately I had to rebase. I noticed that one of the patches were
creating a file that didn't belong to that changeset, creating a file on the
wrong place (at -p2 diff format).

We should be discussing during this kernel cycle about migrating our
development tree to use -git (instead of Mercurial). I hope that this will
avoid to detect such errors so late, and avoid a few conversion issues we
currently have.

Sorry for the mess.

--

Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/