From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NCWBS-0004qY-Da for mharc-grub-devel@gnu.org; Mon, 23 Nov 2009 05:30:14 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCWBQ-0004pT-DM for grub-devel@gnu.org; Mon, 23 Nov 2009 05:30:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCWBL-0004l9-DD for grub-devel@gnu.org; Mon, 23 Nov 2009 05:30:11 -0500 Received: from [199.232.76.173] (port=39222 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCWBL-0004ks-7w for grub-devel@gnu.org; Mon, 23 Nov 2009 05:30:07 -0500 Received: from xvm-190-8.ghst.net ([217.70.190.8]:34045 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 1NCWBK-0001Ub-Ta for grub-devel@gnu.org; Mon, 23 Nov 2009 05:30:07 -0500 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1NCWBJ-0000q0-4N for grub-devel@gnu.org; Mon, 23 Nov 2009 11:30:05 +0100 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1NCWBI-00088D-4I for grub-devel@gnu.org; Mon, 23 Nov 2009 11:30:04 +0100 Date: Mon, 23 Nov 2009 11:30:04 +0100 From: Robert Millan To: The development of GNU GRUB Message-ID: <20091123103004.GA26205@thorin> References: <20091123004418.GA14340@pina.cat> <4B09E31C.7070207@gmail.com> <4B09E80C.7010605@gmail.com> <20091123093341.GB25694@thorin> <20091123095934.GA21603@pinux.info> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20091123095934.GA21603@pinux.info> 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: [ISSUE SOLVED] Re: bazaar 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: Mon, 23 Nov 2009 10:30:12 -0000 On Mon, Nov 23, 2009 at 10:59:34AM +0100, Carles Pina i Estany wrote: > > bzr checkout of trunk (fresh checkout) > 1.- cd grub > 2.- bzr merge sftp://..... people/carles/gettext (as I understood from you > in IRC) These two by themselves don't modify the remote tree (you'd need bzr commit) > After some other things, I worked in carles/gettext in other things and > I did: > 3.- cd carles/gettext (I had this from before) > 4.- bzr pull of trunk??? (I don't think so) > 5.- bzr commit > 6.- bzr push (without any URL) bzr push without any URL uses an implicit value, which *could* be our remote trunk (use bzr info to check). Always use an explicit value when pushing, or check first with bzr info! -- 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."