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

[Mitch D. <mj...@al...>]

NIIBE Yutaka wrote:
> 
> Mitch Davis wrote:
>  > This morning I tried to import the official Linux 2.4.0-test1
>  > into our CVS repository.  Unfortunately there are a number
>  > of source conflicts which will need to be solved before the
>  > import is complete.
> 
> I've found ide.h breakage.  The maintainer of IDE code changed
> asm-sh/ide.h.  I have right version on my private tree.

Yes I saw that.  Here is the listing of changed files.
The "C" ones are ones in conflict.

mjd@orbital [~/linux-src/kernel] cvs -q up
M Documentation/Configure.help
R arch/arm/kernel/iic.c
M arch/sh/kernel/entry.S
M arch/sh/kernel/irq.c
M arch/sh/kernel/ptrace.c
M arch/sh/kernel/signal.c
M arch/sh/kernel/time.c
M arch/sh/lib/checksum.S
M arch/sh/mm/cache.c
C arch/sh/mm/fault.c
C drivers/char/generic_serial.c
C drivers/char/sh-sci.c
C drivers/ide/ide.c
M fs/super.c
R fs/umsdos/check.c
R include/asm-arm/proc-armo/semaphore.h
M include/asm-sh/cache.h
M include/asm-sh/ide.h
R include/net/slhc.h
M mm/vmscan.c
M net/core/skbuff.c

> I've sent the diff to Linus, and it is included the 2.4.0-test1.
> The development went further on SuperH part.

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

> It seems for me that "importing" can't handle such situation.

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.

Regards,

Mitch.
--
| mailto:mj...@al... | Certified Linux Evangelist!
| Note: I am no longer employed by HP.  Update your aliases!