From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NCNai-0000Mu-18 for mharc-grub-devel@gnu.org; Sun, 22 Nov 2009 20:19:44 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCNag-0000KV-3e for grub-devel@gnu.org; Sun, 22 Nov 2009 20:19:42 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCNab-0000EA-Ef for grub-devel@gnu.org; Sun, 22 Nov 2009 20:19:41 -0500 Received: from [199.232.76.173] (port=51430 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCNab-0000E7-7h for grub-devel@gnu.org; Sun, 22 Nov 2009 20:19:37 -0500 Received: from mail-bw0-f215.google.com ([209.85.218.215]:45019) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCNaa-0006dP-IX for grub-devel@gnu.org; Sun, 22 Nov 2009 20:19:36 -0500 Received: by bwz7 with SMTP id 7so5063749bwz.26 for ; Sun, 22 Nov 2009 17:19:35 -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=/prXxvykXTWu0xtD0i9prjdpPanq+G8Y/V5yHsfII+k=; b=wuIi3kDvUZ/pAeFl0r8gBh+lSlV8sQAjQzcX1FtWrTqxFyR2Eu1AIkbw8e2AF5nm6O j3gSK6AfOud7MDC8mVSH1aaxeSwzOoh2xa8gAVNgcjrOv8NZvf1mweVQm5h/g02fIMAi Do8clx9ZO2grRlxxzbVZSxDupf1UIP7IjOKsU= 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=DkcoxluBq+XX9DeWlgjIp+pe7xuoZwBY70rFnYGpvEV9f1XPl9hC6rMyLovQdhhiLo M23MTuVx5xRLcmwWznZFZRSCH8Xi+KDSCXJLaDNqtdxNrCtFru1wJPR3Udr9NT9PT8R6 YPYqF3pPHYeR/IRLLOc9wOOHK+RKfQZhtPEDo= Received: by 10.204.33.140 with SMTP id h12mr4001837bkd.167.1258939175587; Sun, 22 Nov 2009 17:19:35 -0800 (PST) Received: from debian.bg45.phnet (gprs37.swisscom-mobile.ch [193.247.250.37]) by mx.google.com with ESMTPS id 16sm966450bwz.7.2009.11.22.17.19.33 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 22 Nov 2009 17:19:34 -0800 (PST) Message-ID: <4B09E31C.7070207@gmail.com> Date: Mon, 23 Nov 2009 02:19:24 +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 , Robert Millan References: <20091123004418.GA14340@pina.cat> In-Reply-To: <20091123004418.GA14340@pina.cat> X-Enigmail-Version: 0.95.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig839EB8084B14538EEFFFB20F" X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [URGENT] 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 01:19:42 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig839EB8084B14538EEFFFB20F Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Carles Pina i Estany wrote: > Hello, > > I have to go to sleep now, but I've realized about a mistake or at leas= t > unexpected behaviour. > > After merging trunk with people/carles/gettext as Robert said I have be= en > committing and pushing a couple of things to people/carles/gettext. But= I think > that after I merged it trunk now is always merged with carles/gettext .= > > revno 1848 and 1849 in trunk are pushes to my branch (or at least this > was my intention). After a clean checkout from trunk, doing bzr log: > > ------------------------------------------------------------ > revno: 1849 > committer: Carles Pina i Estany > branch nick: carlesgettext > timestamp: Sun 2009-11-22 23:41:06 +0000 > message: > 2009-11-22 Carles Pina i Estany > =20 > * normal/menu_text.c (get_spaces): New function. > (print_timeout): Gettextize, add spaces to the localized string= =2E > ------------------------------------------------------------ > revno: 1848 > committer: Carles Pina i Estany > branch nick: carlesgettext > timestamp: Sun 2009-11-22 22:24:54 +0000 > message: > 2009-11-22 Carles Pina i Estany > =20 > * normal/menu_text.c: Gettexttize but not print_timeout functio= n. > * normal/main.c: Gettexttize. > * normal/menu_entry.c: Likewise. > ------------------------------------------------------------ > > 1848 should be fine but I sent some hours ago a mail to discuss and > confirm it. So we should check, etc. 1849 is a file to track my changes= > but not in trunk > > How we proceed? Should I stop working with people/gettext ? > Should we "unmerge" and merge? > > Thank and apologizes for the bazaar messes ups,=20 > > =20 Looks like the mess is actually more profound than you describe. You replaced our mainstream with your branch. Looks like bzr failed at its primary task: protect against unintentional or intentional deletion of files. We should think of a way to make trunks and experimental branch commit-only. Meanwhile nobody pushes until further notice. I'll see how it can be recovered and protected. Robert: What is your latest backup before this accidental replacement? --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig839EB8084B14538EEFFFB20F 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 iF4EAREKAAYFAksJ4yMACgkQNak7dOguQgkkKAD/eG6ClA2Eq6OMw/TqrnlIGXSd Txi99CSoZqLpc6y5P6kA/2js2Aa6Zcvo+62gdHF06FyZfQCWRjLQPyvTYuU+8xOK =B2yf -----END PGP SIGNATURE----- --------------enig839EB8084B14538EEFFFB20F--