On Sun, 10 Apr 2005, Linus Torvalds wrote: > Then the bad news: the merge algorithm is going to suck. It's going to be > just plain 3-way merge, the same RCS/CVS thing you've seen before. With no
Actually 3-way merge is not that bad. It's definitely better than ClearCase's merge (I always fall back to RCS merge if ClearCase cannot resolve a merge automatically). > understanding of renames etc. I'll try to find the best parent to base the > merge off of, although early testers may have to tell the piece of crud > what the most recent common parent was. Yep, finding the best parent is the important part :-) I guess 3-way merge got a bad name because CVS always uses the branch point as the parent, which fails miserably for any but the first merge after the branch. Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [EMAIL PROTECTED] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/