On Tuesday 10 January 2006 6:38 pm, Ivan Korzakow wrote:
> 2006/1/10, P. Christeas <p_christ@hol.gr>:
> > You make sure you have the two trees and diff them.
> > They 're both in git and typically you could do that only using git.
>
> Have you ever tried what you're talking about or is it a guess ?
> For example, let's say that there's a bug introduced when merging
> Linus tree with mips branch. How do you easily "bisect" in order to do
> a binary seek of this bug ?
I was about to mention the git incompatibility as I gave you the first
answer. It's true what you say and I also find it annoying. That's why I use
Linus tree.
I cannot, though, complaint to Ralph about this practice. It seems that he has
done his best to preserve the CVS history of his tree. We can only thank him
for that. It is just a lot of work to trim the tree and make it
Linus-parallel.
There is also things that I don't know about git, so I won't jump to
conclusions yet (as to whether it is feasible to merge with Linus).
|