From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1N7PZm-00027d-Ey for mharc-grub-devel@gnu.org; Mon, 09 Nov 2009 03:26:14 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N7PZk-00027F-OC for grub-devel@gnu.org; Mon, 09 Nov 2009 03:26:12 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N7PZf-00026k-Ew for grub-devel@gnu.org; Mon, 09 Nov 2009 03:26:11 -0500 Received: from [199.232.76.173] (port=34906 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N7PZf-00026h-Be for grub-devel@gnu.org; Mon, 09 Nov 2009 03:26:07 -0500 Received: from mail-px0-f189.google.com ([209.85.216.189]:51386) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1N7PZf-00010u-2f for grub-devel@gnu.org; Mon, 09 Nov 2009 03:26:07 -0500 Received: by pxi27 with SMTP id 27so898473pxi.25 for ; Mon, 09 Nov 2009 00:26:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=BGd2MBhg/GxLaQHNxF7Dwe6N+SQ/yR663DLHDE/xa3c=; b=ds30TKjRfPQOj17uWf0dxNOak2Oq/lDz34texQGpbP703GdZsVi+UdCl9JVYxHkJQV EmhiHfFq7tPP4BBLNT+AHDK9fxRWXjq2ed9DSmfoyvIiyw7+YE9USbvVpTGyEvVWRt1x H3f3vlTjcJ9prHPPbnI51lrqpr/TBw6QmLCws= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=ZzBI3Ku2Msb22NdapODiAFsbQR6A2LWSjFCQh25r0LMuueV0tgs3WvGEnC6HPUCGZ+ 7gtTVkmqOzkgMcZrSdyIvl4V0OvqcpevvQ9p5Tgi8jvIg2zkiO4hI03zwzptvKsjxlTo GXppuU2Yz1K8Ha9ONQqjxCOPSXkI3aC2w+KrE= MIME-Version: 1.0 Received: by 10.140.166.21 with SMTP id o21mr404772rve.210.1257755166249; Mon, 09 Nov 2009 00:26:06 -0800 (PST) In-Reply-To: <4AF72DCE.0@gmail.com> References: <4AF6E563.9070208@gmail.com> <4AF72DCE.0@gmail.com> Date: Mon, 9 Nov 2009 16:26:06 +0800 Message-ID: From: Bean To: The development of GNU GRUB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: bzr is online 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, 09 Nov 2009 08:26:12 -0000 On Mon, Nov 9, 2009 at 4:45 AM, Vladimir 'phcoder' Serbinenko wrote: > Bean wrote: >> On Sun, Nov 8, 2009 at 11:36 PM, Vladimir 'phcoder' Serbinenko >> wrote: >> >>> Hello, all. As you may have heard or noticed we had a data corruption i= n >>> bzr repository. We couldn't find for sure what caused it but we could >>> recover it, Robert Millan is running regular backups. But please be >>> careful in the future. >>> 1) Don't use bzr-svn. The IDs won't match anyway so it's useless. I >>> removed bzr-svn altogether >>> 2) Don't use bzr+ssh. Old daemon on savannah is one of possible vectors= . >>> --2a format should block it but don't even try please. Use >>> sftp://bzr.savannah.gnu.org/srv/bzr/grub/ >>> >>> 3) Take precautions when handling your current branches. As the IDs >>> don't match the bzr trunk you need to migrate it anyway. If you have >>> small number of branches and history isn't important just create a patc= h >>> and apply it to new bzr branch of current trunk. If you have large >>> number of branches or no local copy contact me privately. >>> 4) Regularly run "bzr check" on your repository >>> 5) Sign your commits. For this add >>> create_signatures =3D always >>> to your bazaar.conf >>> This has double use: security and integrity. >>> >>> Currentyl we haven't set up syncronisation between bzr and svn. Wait >>> further instructions before comitting to mainstream >>> >> >> Hi, >> >> I just sync my branch with main bzr repo, and find similar issue. It >> seems the bzr diff =A0has bug that could cause problem with renames, for >> example, don't use this: >> >> old branch: >> bzr diff > aa.diff >> >> new branch: >> bzr patch aa.diff >> >> The renamed file could get lost in the process. The only reliable way >> to apply patch is to export the whole tree from old branch, and add >> them in the new branch. >> >> > I don't know what exactly do you mean but the concern is safety: your > approach may result in corruption to be transfered to new repo Hi, It's very easy to verify, for example, run these commands: bzr mv COPYING COPYING1 bzr diff > aa.diff Output: =3D=3D=3D renamed file 'COPYING' =3D> 'COPYING1' This is obviously wrong, as neither "patch" nor "bzr patch" recognize this format, so if you apply it with: bzr patch aa.diff Nothing happens. Therefore, 'bzr diff' is useless to create patch file containing renames. BTW, my bzr version is 2.0.2 --=20 Bean My repository: https://launchpad.net/burg Document: https://help.ubuntu.com/community/Burg