On Tue, Jan 19, 2010 at 12:44:18PM +0100, Michal Suchanek wrote: > 2010/1/19 Colin Watson <cjwat...@ubuntu.com>: > > lp:~jelmer/bzr-rewrite/trunk-mirrorred is the one you actually want (or > > you can use the tarball). > > Either does nothing. Perhaps they don't support rebasing of branches > which are already merged with trunk.
You could always experiment by checking out an older revision of your branch. In any case, there's nothing intrinsically wrong with merging in branches that themselves have merge history. We do this ourselves quite frequently; see the recent savedefault merge, for example. -- Colin Watson [cjwat...@ubuntu.com] _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org http://lists.gnu.org/mailman/listinfo/grub-devel
