From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NXCeF-0004Q7-1h for mharc-grub-devel@gnu.org; Tue, 19 Jan 2010 06:53:27 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXCeD-0004Pl-8f for grub-devel@gnu.org; Tue, 19 Jan 2010 06:53:25 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXCe8-0004Ny-AD for grub-devel@gnu.org; Tue, 19 Jan 2010 06:53:24 -0500 Received: from [199.232.76.173] (port=35766 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXCe7-0004Nf-Sr for grub-devel@gnu.org; Tue, 19 Jan 2010 06:53:19 -0500 Received: from smarthost03.mail.zen.net.uk ([212.23.3.142]:46619) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NXCe7-0007Rh-Gt for grub-devel@gnu.org; Tue, 19 Jan 2010 06:53:19 -0500 Received: from [82.69.40.219] (helo=riva.pelham.vpn.ucam.org) by smarthost03.mail.zen.net.uk with esmtp (Exim 4.63) (envelope-from ) id 1NXCe6-0006gt-HZ for grub-devel@gnu.org; Tue, 19 Jan 2010 11:53:18 +0000 Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1 (Debian)) for grub-devel@gnu.org id 1NXCe6-00063w-00; Tue, 19 Jan 2010 11:53:18 +0000 Date: Tue, 19 Jan 2010 11:53:18 +0000 From: Colin Watson To: The development of GNU GRUB Message-ID: <20100119115318.GC5847@riva.ucam.org> References: <20100119110753.GA5847@riva.ucam.org> <20100119112046.GB5847@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) X-Originating-Smarthost03-IP: [82.69.40.219] X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: fb rotation merge directive X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GNU GRUB List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 19 Jan 2010 11:53:25 -0000 On Tue, Jan 19, 2010 at 12:44:18PM +0100, Michal Suchanek wrote: > 2010/1/19 Colin Watson : > > 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 [cjwatson@ubuntu.com]