From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1N4EGI-0005Pu-3R for mharc-grub-devel@gnu.org; Sat, 31 Oct 2009 09:44:58 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N4EGG-0005Pg-8u for grub-devel@gnu.org; Sat, 31 Oct 2009 09:44:56 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N4EGA-0005P8-Ub for grub-devel@gnu.org; Sat, 31 Oct 2009 09:44:54 -0400 Received: from [199.232.76.173] (port=42287 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N4EGA-0005P4-Kz for grub-devel@gnu.org; Sat, 31 Oct 2009 09:44:50 -0400 Received: from xvm-190-8.ghst.net ([217.70.190.8]:42670 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 1N4EGA-00019C-86 for grub-devel@gnu.org; Sat, 31 Oct 2009 09:44:50 -0400 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1N4EG6-0005Z7-5b for grub-devel@gnu.org; Sat, 31 Oct 2009 14:44:46 +0100 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1N4EG7-00060P-CZ for grub-devel@gnu.org; Sat, 31 Oct 2009 14:44:47 +0100 Date: Sat, 31 Oct 2009 14:44:47 +0100 From: Robert Millan To: The development of GRUB 2 Message-ID: <20091031134447.GA22646@thorin> 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> 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:44:56 -0000 On Sat, Oct 31, 2009 at 12:36:57PM +0000, Carles Pina i Estany wrote: > > Hi, > > 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/ The gettext branch was based on an old trunk, I've just regenerated it, try branching again. > 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: Is this what you wanted? bzr diff -r ancestor:bzr+ssh://bzr.savannah.gnu.org/grub/trunk/grub Btw, if you're just trying to resync, it's better if you use bzr for that, e.g.: $ bzr pull bzr+ssh://bzr.savannah.gnu.org/grub/trunk/grub bzr: ERROR: These branches have diverged. Use the missing command to see how. Use the merge command to reconcile them. $ bzr merge bzr+ssh://bzr.savannah.gnu.org/grub/trunk/grub [...] Text conflict in conf/common.rmk Text conflict in kern/misc.c Text conflict in util/grub-mkconfig_lib.in Text conflict in util/grub.d/00_header.in Text conflict in util/grub.d/10_linux.in 5 conflicts encountered. $ bzr resolve conf/common.rmk After this is done, you can push to /people//gettext or so. -- 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."