./builder once again

[Krzysiek Taraszka]

[dzimi w admin SPECS]$ ./builder -a5 kernel.spec
RCS file: /cvsroot/SPECS/kernel.spec,v
retrieving revision 1.363.4.7
retrieving revision 1.418
Merging differences between 1.363.4.7 and 1.418 into kernel.spec
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in kernel.spec
C kernel.spec
# $Revision: 1.418 $, $Date: 2003/06/06 12:33:21 $
[dzimi w admin SPECS]$ rm kernel.spec
rm: usunąć zabezpieczony przez zapisem zwykły plik `kernel.spec'? y
[dzimi w admin SPECS]$ cp kernel.spec22 kernel.spec
[dzimi w admin SPECS]$ ./builder -a5 -r LINUX_2_2 kernel.spec
RCS file: /cvsroot/SPECS/kernel.spec,v
retrieving revision 1.418
retrieving revision 1.363.4.7
Merging differences between 1.418 and 1.363.4.7 into kernel.spec
rcsmerge: warning: conflicts during merge
cvs server: conflicts found in kernel.spec
C kernel.spec
[dzimi w admin SPECS]$

powinno raczej byc M kernel.spec
i dodawac powinno sumy md5 ...

-- 
Krzysiek Taraszka			 	   (dzimi w pld.org.pl)
http://cyborg.kernel.pl/~dzimi/
arch/sparc64/kernel/binfmt_aout32.c:/* Fuck me plenty... */