From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1N4Erc-0001fa-Bc for mharc-grub-devel@gnu.org; Sat, 31 Oct 2009 10:23:32 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N4Era-0001fO-I1 for grub-devel@gnu.org; Sat, 31 Oct 2009 10:23:30 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N4ErV-0001el-L1 for grub-devel@gnu.org; Sat, 31 Oct 2009 10:23:29 -0400 Received: from [199.232.76.173] (port=52743 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N4ErV-0001ei-Fr for grub-devel@gnu.org; Sat, 31 Oct 2009 10:23:25 -0400 Received: from smarthost02.mail.zen.net.uk ([212.23.3.141]:49665) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N4ErV-0006Oy-4i for grub-devel@gnu.org; Sat, 31 Oct 2009 10:23:25 -0400 Received: from [82.69.40.219] (helo=riva.pelham.vpn.ucam.org) by smarthost02.mail.zen.net.uk with esmtp (Exim 4.63) (envelope-from ) id 1N4ErT-00072T-Mb for grub-devel@gnu.org; Sat, 31 Oct 2009 14:23:24 +0000 Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1 (Debian)) for grub-devel@gnu.org id 1N4ErP-0007fY-00; Sat, 31 Oct 2009 14:23:19 +0000 Date: Sat, 31 Oct 2009 14:23:19 +0000 From: Colin Watson To: The development of GRUB 2 Message-ID: <20091031142319.GG28534@riva.ucam.org> References: <20091031123657.GA29323@pina.cat> <20091031132620.GF28534@riva.ucam.org> <20091031134549.GB22646@thorin> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091031134549.GB22646@thorin> User-Agent: Mutt/1.5.18 (2008-05-17) X-Originating-Smarthost02-IP: [82.69.40.219] X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) Subject: Re: Diff between Branches X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: The development of GRUB 2 List-Id: The development of GRUB 2 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 Oct 2009 14:23:30 -0000 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 [cjwatson@ubuntu.com]