From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NCNvE-0000vm-D6 for mharc-grub-devel@gnu.org; Sun, 22 Nov 2009 20:40:56 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCNvC-0000tj-JR for grub-devel@gnu.org; Sun, 22 Nov 2009 20:40:54 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCNv8-0000oa-Ha for grub-devel@gnu.org; Sun, 22 Nov 2009 20:40:54 -0500 Received: from [199.232.76.173] (port=55484 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCNv8-0000oO-Bq for grub-devel@gnu.org; Sun, 22 Nov 2009 20:40:50 -0500 Received: from mail-bw0-f215.google.com ([209.85.218.215]:58572) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCNv7-0001Nv-Pg for grub-devel@gnu.org; Sun, 22 Nov 2009 20:40:50 -0500 Received: by bwz7 with SMTP id 7so5069887bwz.26 for ; Sun, 22 Nov 2009 17:40:48 -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=mdIfbqKYdTowgRJevhgRVJoSZtn7foxfwMvb2vCv5lk=; b=CL8MGBTj39hivuJyyRemiYPB+ohthvgRY51f3aCL3APL04A+KUnsCGt6tEXC4f2RGC /C/m/UvXb+FxbIeYo6yUqBIkFsZJDe50SDnTcamiVbJ8AhcMONhvSCr67FrJtlPxsNgp U3gVe0qfEunNzOtMYcUBKG78FAE0u7ErIOgGk= 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=c2s8BjBJ3CqwD9n3Xt/ZhKSoNApZyP2DEcjZ/uMPv6GAFKt2A5n46mYVIkntw1MVJd sdmdDYXUwUWCefusBwi/mlleeGj47sgqVqzYYJU4uxwaOseKyiY9gjl065chWIQfS1Bl mgt9X4FXpOHg+6Wad9LpTY6F+aFyp3qJrv7rA= Received: by 10.204.34.73 with SMTP id k9mr4224400bkd.45.1258940448851; Sun, 22 Nov 2009 17:40:48 -0800 (PST) Received: from debian.bg45.phnet (gprs37.swisscom-mobile.ch [193.247.250.37]) by mx.google.com with ESMTPS id 15sm962868bwz.0.2009.11.22.17.40.47 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 22 Nov 2009 17:40:48 -0800 (PST) Message-ID: <4B09E80C.7010605@gmail.com> Date: Mon, 23 Nov 2009 02:40:28 +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> <4B09E31C.7070207@gmail.com> In-Reply-To: <4B09E31C.7070207@gmail.com> X-Enigmail-Version: 0.95.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="------------enig81E7294E9D8A6F7954525080" X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Subject: [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 01:40:54 -0000 This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig81E7294E9D8A6F7954525080 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Vladimir '=CF=86-coder/phcoder' Serbinenko wrote: > Carles Pina i Estany wrote: > =20 >> Hello, >> >> I have to go to sleep now, but I've realized about a mistake or at lea= st >> unexpected behaviour. >> >> After merging trunk with people/carles/gettext as Robert said I have b= een >> committing and pushing a couple of things to people/carles/gettext. Bu= t I think >> that after I merged it trunk now is always merged with carles/gettext = =2E >> >> 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 strin= g. >> ------------------------------------------------------------ >> 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 functi= on. >> * 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 change= s >> 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 >> =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 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 If you comitted recently please check if nothing is missing Carles: check your locations in =2Ebzr/branch/branch.conf --=20 Regards Vladimir '=CF=86-coder/phcoder' Serbinenko --------------enig81E7294E9D8A6F7954525080 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 iF4EAREKAAYFAksJ6BsACgkQNak7dOguQgmotgD/eMrGiGybEd2fzeT7SIK7dmBw epa5oYDvwf08B0TqGPAA/33zqEAZTqE6t9h6dm2gYGY3JtAFFc8ouafbcwmWOFno =yVg1 -----END PGP SIGNATURE----- --------------enig81E7294E9D8A6F7954525080--