Conflict in debian-installer/tools/base-installer/debian/
Please clean up the conflict you commited, and make it a habit to use
'cvs diff -u' before you commit:
> Index: kernel-installer.postinst
> ===================================================================
> RCS file: /cvs/debian-boot/debian-installer/tools/base-installer/debian/kernel-installer.postinst,v
> retrieving revision 1.35
> retrieving revision 1.36
> diff -u -d -r1.35 -r1.36
> --- kernel-installer.postinst 22 Oct 2003 12:42:01 -0000 1.35
> +++ kernel-installer.postinst 27 Oct 2003 19:18:47 -0000 1.36
> @@ -140,10 +140,38 @@
> fi
> ;;
> esac
> +<<<<<<< kernel-installer.postinst
> +<<<<<<< kernel-installer.postinst
> + powerpc)
> + version=2.4.21 #hack, hack!
> + MODEL=`/usr/bin/ppcdetect`
> + case "$MODEL" in
> + NewWorld)
> + kernel=kernel-image-$version-powerpc
> + ;;
> + # what's below is probably nonsene, porters have to start building 2.4 kernels for d-i!
> + # But at least the infrastructure will be there and these are the latest versions in
> + # the archive.
> + OldWorld)
> + kernel=kernel-image-$version-powerpc
> + ;;
> + PReP)
> + kernel=kernel-image-2.2.20-prep
> + ;;
> + CHRP)
> + kernel=kernel-image-2.2.20-chrp
> + ;;
> + *)
> + log "warning: Unknown powerpc subarchitecture '$MODEL'."
> + ;;
> + esac
> +=======
> +=======
> ;;
> +>>>>>>> 1.32
> powerpc)
> version=2.4.22 #hack, hack!
> - MODEL=`/usr/bin/archdetect`
> + MODEL=`/bin/archdetect`
> case "$MODEL" in
> "powerpc/powermac_newworld")
> trykernel=kernel-image-$version-powerpc
> @@ -168,6 +196,7 @@
> log "warning: Unknown powerpc subarchitecture '$MODEL'."
> ;;
> esac
> +>>>>>>> 1.29
> ;;
> *)
> log "warning: Unknown architecture '$ARCH'."
Reply to: