From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NCXhv-0006en-00 for mharc-grub-devel@gnu.org; Mon, 23 Nov 2009 07:07:51 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCXhr-0006dd-TR for grub-devel@gnu.org; Mon, 23 Nov 2009 07:07:47 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCXhm-0006bK-NZ for grub-devel@gnu.org; Mon, 23 Nov 2009 07:07:47 -0500 Received: from [199.232.76.173] (port=44386 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCXhm-0006ay-77 for grub-devel@gnu.org; Mon, 23 Nov 2009 07:07:42 -0500 Received: from mail-bw0-f215.google.com ([209.85.218.215]:49276) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCXhl-0002dS-P3 for grub-devel@gnu.org; Mon, 23 Nov 2009 07:07:41 -0500 Received: by bwz7 with SMTP id 7so5333320bwz.26 for ; Mon, 23 Nov 2009 04:07:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:subject:references:in-reply-to :x-enigmail-version:content-type; bh=t0GJr3VTImYJdGoUaFCKKTz1u1xYK1MBqusKAPgfi0k=; b=VCl/RzcrY2S6N8mLC09sfelzdEt2n4lL23Sxs8HwUXQp05ly9+Sq8AK5uoyrI7nyje 200lBnw/vtoJW+uGdOlNaT0z72vI/g/dmf/V6hqiGt4T8BjtWWrGc5LGhhcCgIrmLDtW NwrphMEqhU2yqUlmUJVXTgsKBTNxHx+RfYWTc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:x-enigmail-version:content-type; b=P/40IFD72qFmE784dAIoPrBzE2RvPf7CyqX5eku97kyUq+uAr+4hl1sIzBY2G78zof C5iothI/mfnSbu8qmXgJihoOeGGLSRHHUPA04GcFsWrjr3q2JiYYRJ9TqhHxcrFDnFSz 75mQeMy8IpuxE+cua/DneJkPQW7FHKG30CVhA= Received: by 10.204.24.83 with SMTP id u19mr4712166bkb.22.1258978060663; Mon, 23 Nov 2009 04:07:40 -0800 (PST) Received: from debian.bg45.phnet (vpn-global-126-dhcp.ethz.ch [129.132.211.126]) by mx.google.com with ESMTPS id 35sm5613796fkt.10.2009.11.23.04.07.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 23 Nov 2009 04:07:39 -0800 (PST) Message-ID: <4B0A79A6.1090102@gmail.com> Date: Mon, 23 Nov 2009 13:01:42 +0100 From: =?UTF-8?B?VmxhZGltaXIgJ8+GLWNvZGVyL3BoY29kZXInIFNlcmJpbmVua28=?= User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20091109) MIME-Version: 1.0 To: The development of GNU GRUB References: <20091123004418.GA14340@pina.cat> <4B09E31C.7070207@gmail.com> <4B09E80C.7010605@gmail.com> <20091123093341.GB25694@thorin> In-Reply-To: <20091123093341.GB25694@thorin> X-Enigmail-Version: 0.95.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig19F805A922DD146246468AA4" X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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 12:07:48 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig19F805A922DD146246468AA4 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Robert Millan wrote: > On Mon, Nov 23, 2009 at 02:40:28AM +0100, Vladimir '=CF=86-coder/phcode= r' Serbinenko wrote: > =20 >> I managed to unmerge our mainstream by using raw revid (visible with b= zr >> log -n0 --show-ids) by >> bzr branch -r revid:<..revid..> mainline mainline-real >> If you comitted recently please check if nothing is missing >> Carles: check your locations in >> .bzr/branch/branch.conf >> =20 > > Thanks Vladimir. Btw, there's also "bzr uncommit". > > =20 Probably wouldn't have helped. Trunk was replaced by Carles' branch and original trunk was available only as a merge into this branch > Carles, can you explain the sequence of commands you used for this to h= appen? > I think I told you yesterday not to use "bzr push", and I can't think o= f > another way that would lead to this. > > =20 --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig19F805A922DD146246468AA4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iF4EAREKAAYFAksKeaYACgkQNak7dOguQgloLgEAn6UWLe0EHDihIp0INAL9EgNQ kbsSCFjTGV0+6aTprN0A+wVBXNGNZOagEE0xEbTrL1p/oH4qc3i2gXiLoE5gE63I =WwDy -----END PGP SIGNATURE----- --------------enig19F805A922DD146246468AA4--