From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with archive (Exim 4.43) id 1NXFPE-0001YU-Hj for mharc-grub-devel@gnu.org; Tue, 19 Jan 2010 09:50:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NXFPC-0001W2-Rz for grub-devel@gnu.org; Tue, 19 Jan 2010 09:50:06 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NXFPC-0001Un-1f for grub-devel@gnu.org; Tue, 19 Jan 2010 09:50:06 -0500 Received: from [199.232.76.173] (port=33580 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NXFPB-0001Ua-SK for grub-devel@gnu.org; Tue, 19 Jan 2010 09:50:05 -0500 Received: from gator297.hostgator.com ([74.53.228.114]:45626) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NXFPB-0004JX-Ca for grub-devel@gnu.org; Tue, 19 Jan 2010 09:50:05 -0500 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gibibit.com; h=Received:Date:From:To:Subject:Message-ID:In-Reply-To:References:X-Mailer:Mime-Version:Content-Type; b=iWLH+xqEOUJFi/rp3XaXfjW6v8Hs4aqe6wId4gt/MphT1fFQOWDVZBFVGHXXEaCJLhDD6I5Dygv6MX46vjk9eWGKbbTACV8QmEHuc4BbaFx0VW2i8pf3vhYmAuY65LeK; Received: from c-67-185-87-185.hsd1.wa.comcast.net ([67.185.87.185]:60624 helo=svelte) by gator297.hostgator.com with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69) (envelope-from ) id 1NXFP7-0008Er-8R for grub-devel@gnu.org; Tue, 19 Jan 2010 08:50:01 -0600 Date: Tue, 19 Jan 2010 06:49:59 -0800 From: Colin D Bennett To: grub-devel@gnu.org Message-ID: <20100119064959.315b5c14@svelte> In-Reply-To: References: <20100118094915.342a0469@svelte> X-Mailer: Claws Mail 3.7.2 (GTK+ 2.18.3; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: multipart/signed; micalg=PGP-SHA1; boundary="Sig_/bvtDHeDEPB7z=CIVSCsoh/z"; protocol="application/pgp-signature" X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator297.hostgator.com X-AntiAbuse: Original Domain - gnu.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - gibibit.com X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Subject: Re: Bazaar workflow for GRUB 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: Tue, 19 Jan 2010 14:50:07 -0000 --Sig_/bvtDHeDEPB7z=CIVSCsoh/z Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Tue, 19 Jan 2010 11:52:27 +0100 Michal Suchanek wrote: > 2010/1/19 BVK Chaitanya : > > On Mon, Jan 18, 2010 at 11:19 PM, Colin D Bennett > > wrote: >=20 > >>> > >>> # create a patch and send to mailing list > >>> grub$ bzr diff -r submit: > ~/my-issue-fix.diff > >> > >> Why not use =E2=80=9Cbzr send -o ~/my-issue-fix.patch=E2=80=9D to crea= te a merge > >> directive+patch+revision bundle? =C2=A0The benefit of bzr send over > >> plain bzr diff is that individual revisions within the change are > >> preserved, which can provide richer history. =C2=A0Merge directives can > >> simply be applied with =E2=80=9Cbzr merge my-issue-fix.patch=E2=80=9D. > >> > > > > I haven't seen anybody sending "bzr send" patches in the ML, so I >=20 > Perhaps they did not know or did not need to. AFAICT there isn't any > rebase feature in bzr so sending these is the only option for longer > lasting local branches. There is actually a =E2=80=98rebase=E2=80=99 plugin for bzr (=E2=80=9Cbzr b= ranch lp:bzr-rebase $HOME/.bazaar/plugins/rebase=E2=80=9D to install for a user). I'm not sure= how =E2=80=98bzr send=E2=80=99 is in some way more useful if a rebase operation= was not available, however. > > didn't want to introduce something new. =C2=A0Is its format compatible > > with regular patch tool? >=20 > Yes, they do include something that looks like a regular patch. > Did not try applying it, though. The output of =E2=80=98bzr send=E2=80=99 normally includes three parts: 1. Merge directive. This specifies what branch the patch is against as well as other information about it. This can be the only part if the changes are available in a publicly accessible branch. 2. Patch. This is standard unified diff format and can be applied with the patch command. 3. Revision bundle. This contains the actual complete revision data for the changes. Each individual committed revision including log messages, renamed files, merge history, etc., is included in the revision bundle. This is a chunk of binary data encoded to ASCII. When the revision bundle is provided, no public branch containing the patch's changes is required to be available. In short, the =E2=80=98bzr send=E2=80=99 output can be treated as a standar= d patch for review purposes as well as for application using the patch command, but using =E2=80=98bzr merge=E2=80=99 for merge these special patches provi= des richer history and much better automatic merges than would be obtained by using the standard patch command. Regards, Colin --Sig_/bvtDHeDEPB7z=CIVSCsoh/z Content-Type: application/pgp-signature; name=signature.asc Content-Disposition: attachment; filename=signature.asc -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAktVxpcACgkQokx8fzcGbYf7EgCfWv4CyEdB2H0S19lUuku1EN9O MhsAn2BCOK5iTecp2i6SBwz1awUAMzbe =ke9+ -----END PGP SIGNATURE----- --Sig_/bvtDHeDEPB7z=CIVSCsoh/z--