From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1N4EHG-0005y0-Sa for mharc-grub-devel@gnu.org; Sat, 31 Oct 2009 09:45:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N4EHE-0005vP-Nw for grub-devel@gnu.org; Sat, 31 Oct 2009 09:45:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N4EHA-0005q4-0l for grub-devel@gnu.org; Sat, 31 Oct 2009 09:45:56 -0400 Received: from [199.232.76.173] (port=42307 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N4EH9-0005px-O1 for grub-devel@gnu.org; Sat, 31 Oct 2009 09:45:51 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:42671 helo=aybabtu.com) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N4EH9-0001Iv-5x for grub-devel@gnu.org; Sat, 31 Oct 2009 09:45:51 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1N4EH5-0005ZD-Qq for grub-devel@gnu.org; Sat, 31 Oct 2009 14:45:48 +0100 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1N4EH7-00060Y-4m for grub-devel@gnu.org; Sat, 31 Oct 2009 14:45:49 +0100 Date: Sat, 31 Oct 2009 14:45:49 +0100 From: Robert Millan To: The development of GRUB 2 Message-ID: <20091031134549.GB22646@thorin> References: <20091031123657.GA29323@pina.cat> <20091031132620.GF28534@riva.ucam.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091031132620.GF28534@riva.ucam.org> Organization: free as in freedom X-Message-Flag: Worried about Outlook viruses? Switch to Thunderbird! www.mozilla.com/thunderbird X-Debbugs-No-Ack: true User-Agent: Mutt/1.5.18 (2008-05-17) 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 13:45:57 -0000 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? -- Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."