Re: [PATCH 000/141] V4L/DVB updates part 1

Linus Torvalds
2006-03-21T18:03:34Z

On Tue, 21 Mar 2006, Mauro Carvalho Chehab wrote:
>
> > Looking closer, the commit after that is a _real_ merge, and it looks like
> > you did something strange when that at first conflicted in saa7134-dvb.c
> > or something. I just don't even see _how_ you created that bogus non-merge
> > commit. Are you using cogito? It has some problems with conflict
> > resolution, I think. Real git should not even have allowed you to commit
> > something that hadn't been resolved.
>
> I'm using stgit. It allows me to export the patches from V4L/DVB
> Mercurial tree, removing backward compatible code and correcting the
> patches. Is it broken?

Hmm. I don't know if it's stgit per se. Maybe the breakage came from a
mercurial merge that got exported to git as a patch, rather than as a
merge.

If that's the case, then I'm afraid that the problem is the mercurial
part, or at least the hg->git conversion. I have no idea how hg does
merges, and maybe the broken merge was done in the hg tree.

The really sad part about this is that it means I have to be much more
careful with dvb merges, since I can't trust the tree any more, when it
apparently has something strange going on. If things like this keep on
happening, I'll have to ask you guys to change your work habits.

That said, I _tried_ to check for similar cases in the past history, and I
couldn't find any. So hopefully this was a one-off occurrence.

Linus