From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NCVKj-0002Rr-Mh for mharc-grub-devel@gnu.org; Mon, 23 Nov 2009 04:35:45 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCVKf-0002OB-3K for grub-devel@gnu.org; Mon, 23 Nov 2009 04:35:41 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCVKa-0002Ju-77 for grub-devel@gnu.org; Mon, 23 Nov 2009 04:35:40 -0500 Received: from [199.232.76.173] (port=51764 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCVKa-0002Jp-1c for grub-devel@gnu.org; Mon, 23 Nov 2009 04:35:36 -0500 Received: from xvm-190-8.ghst.net ([217.70.190.8]:59587 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 1NCVKZ-0000nx-Hs for grub-devel@gnu.org; Mon, 23 Nov 2009 04:35:35 -0500 Received: from [192.168.10.10] (helo=thorin) by aybabtu.com with esmtp (Exim 4.69) (envelope-from ) id 1NCVKV-0000fs-Dm for grub-devel@gnu.org; Mon, 23 Nov 2009 10:35:32 +0100 Received: from rmh by thorin with local (Exim 4.69) (envelope-from ) id 1NCVKU-0006iR-U2 for grub-devel@gnu.org; Mon, 23 Nov 2009 10:35:30 +0100 Date: Mon, 23 Nov 2009 10:35:30 +0100 From: Robert Millan To: The development of GNU GRUB Message-ID: <20091123093530.GA25807@thorin> References: <20091123004418.GA14340@pina.cat> <4B09E31C.7070207@gmail.com> <4B09E80C.7010605@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <4B09E80C.7010605@gmail.com> 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 09:35:41 -0000 On Mon, Nov 23, 2009 at 02:40:28AM +0100, Vladimir 'φ-coder/phcoder' Serbinenko wrote: > I managed to unmerge our mainstream by using raw revid (visible with bzr > log -n0 --show-ids) by > bzr branch -r revid:<..revid..> mainline mainline-real Btw with "mainstream" and "mainline", I assume you refer to trunk? -- 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."