Vladimir 'φ-coder/phcoder' Serbinenko wrote: > >> Other that this it can be merged into experimental. Be sure to push > >> branches/cbi and then merge branches/cbi into experimental
Hi, it is done. But I am not 100% sure if I did it correctly - there is list what I did (I hope according to your suggestions): 1. I made cbi branch from trunk 2. I applied CBI patch to cbi repository and committed changes 3. I pushed cbi repository to bzr.savannah.gnu.org/srv/bzr/grub/branches/cbi 4. I merged cbi into experimental branch, commited changes and pushed. And there could be problem. Changes listed during merging were: M ChangeLog M grub-core/bus/usb/ohci.c M grub-core/bus/usb/uhci.c M grub-core/bus/usb/usbtrans.c M grub-core/disk/usbms.c M grub-core/loader/i386/linux.c M grub-core/term/efi/console.c M include/grub/scsi.h No problem with ohci.c, uhci.c, usbtrans.c, usbms.c, scsi.h (my changes) and probably no problem with ChangeLog (it is probably not critical in experimental branch - or ?). But what about replacing files "linux.c" and "console.c" - is it correct ? (I can imagine these files have older version in trunk - or is it not possible ?) Regards Ales _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel
