On Sat, Oct 31, 2009 at 02:45:49PM +0100, Robert Millan wrote: > On Sat, Oct 31, 2009 at 01:26:22PM +0000, Colin Watson wrote: > > This usually means that there is a problem with the way the branches > > were created or with the way they've been managed, such that the files > > in each branch do not have common ancestry. > > I had to regenerate the commits one by one (fortunately there weren't many). > > Do you know a more efficient way?
It may be possible to use the 'bzr replay' command from the bzr-rebase plugin. I don't use this often myself, but it seems like nominally the right answer. -- Colin Watson [cjwat...@ubuntu.com] _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel