Re: [linuxsh-dev] Status report on import of Linux 2.4.0-test1

[NIIBE Y. <gn...@ch...>]

Mitch Davis wrote:
 > I will see how I can fix the test0 import, and import test1
 > as well, tonight.  (And binutils as well! :-()

There's no test0.  SuperH changes is included in -pre9.

 > The merge mechanism is not perfect, and can't handle overlapping
 > changes very well.  CVS is fine when people fix different things,
 > even in the same file.  But if two people fix the same problem
 > in different ways, it can lead to very nasty conflict problems.

Situation is like this:

Say, Linux released 2.3.99-pre8.  We worked on our part based on
2.3.99-pre8, resulted 2.3.99-pre8+sh1.  I sent the diff
2.3.99-pre8-2.3.99-pre8+sh1 to Linus.  While Linus didn't released
any, our development went further, resulted 2.3.99-pre8+sh2.  Then,
Linus released 2.3.99-pre9 which included +sh1 among other things.

What we need is to make 2.3.99-pre9+sh from 2.3.99-pre9 and 2.3.99-pre8+sh2.

	2.3.99-pre9+sh = 2.3.99-pre9 + 2.3.99-pre8+sh2 - 2.3.99-pre8+sh1

in theory.

Anyway, I have the result in my private tree.

But CVS would say "Up-to-date check failed", when I have tried to commit.
How are things solved in this situation?
--