From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1N4DyT-0007nH-W3 for mharc-grub-devel@gnu.org; Sat, 31 Oct 2009 09:26:34 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N4DyR-0007m9-Tl for grub-devel@gnu.org; Sat, 31 Oct 2009 09:26:31 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N4DyN-0007lR-1Q for grub-devel@gnu.org; Sat, 31 Oct 2009 09:26:31 -0400 Received: from [199.232.76.173] (port=43534 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N4DyM-0007lO-SA for grub-devel@gnu.org; Sat, 31 Oct 2009 09:26:26 -0400 Received: from smarthost03.mail.zen.net.uk ([212.23.3.142]:49984) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N4DyM-0006Xy-Hh for grub-devel@gnu.org; Sat, 31 Oct 2009 09:26:26 -0400 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 1N4DyL-0003Qa-Bb for grub-devel@gnu.org; Sat, 31 Oct 2009 13:26:25 +0000 Received: from cjwatson by riva.pelham.vpn.ucam.org with local (Exim 3.36 #1 (Debian)) for grub-devel@gnu.org id 1N4DyJ-0006sv-00; Sat, 31 Oct 2009 13:26:23 +0000 Date: Sat, 31 Oct 2009 13:26:22 +0000 From: Colin Watson To: The development of GRUB 2 Message-ID: <20091031132620.GF28534@riva.ucam.org> References: <20091031123657.GA29323@pina.cat> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091031123657.GA29323@pina.cat> 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: 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:26:32 -0000 On Sat, Oct 31, 2009 at 12:36:57PM +0000, Carles Pina i Estany wrote: > I'm novice with Bazaar. > I would like to diff between gettext branch and trunk. I did: > > bzr branch http://bzr.savannah.gnu.org/r/grub/people/robertmh/gettext/ > cd gettext > bzr diff -r branch:http://bzr.savannah.gnu.org/r/ub/trunk/grub > > But I have some unexpected results like adding files and removing files > that I would not expect: > > === added file 'AUTHORS' > --- AUTHORS 1970-01-01 00:00:00 +0000 > +++ AUTHORS 2009-10-31 12:19:08 +0000 > > and then: > === removed file 'AUTHORS' > --- AUTHORS 2005-09-03 16:54:27 +0000 > +++ AUTHORS 1970-01-01 00:00:00 +0000 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. (Bazaar assigns each file a unique file-id in order to support good rename tracking, and will only consider two files to be different versions of the same file if they have the same file-id; you can see the file-id with e.g. 'bzr ls --show-ids'.) I haven't looked at these two branches to find out exactly what's happened. -- Colin Watson [cjwatson@ubuntu.com]