From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.71) id 1UqTfp-0003hy-QG for mharc-grub-devel@gnu.org; Sat, 22 Jun 2013 15:40:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55400) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqTfn-0003gx-9V for grub-devel@gnu.org; Sat, 22 Jun 2013 15:40:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UqTfm-0008Bm-3M for grub-devel@gnu.org; Sat, 22 Jun 2013 15:40:35 -0400 Received: from mail-la0-x232.google.com ([2a00:1450:4010:c03::232]:37020) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UqTfl-0008Bc-Rh for grub-devel@gnu.org; Sat, 22 Jun 2013 15:40:34 -0400 Received: by mail-la0-f50.google.com with SMTP id dy20so8687601lab.37 for ; Sat, 22 Jun 2013 12:40:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:subject:message-id:in-reply-to:references:x-mailer :mime-version:content-type:content-transfer-encoding; bh=sVILV8T0b7MIJxdB6xKNI1y9OXY9xgW1RaHGu48/u64=; b=pSdvLrUMlWmiGhLfwobBnf7DCzZk6n1/O9rGiQXGrf0XUKvYghRbYQEeHx7Qynz8rU 0YCCrw3Yd7sZCu1xn+3v3bAk2J6x0YyzDmrXn+JOpOiCMdBhCrbnG2jD7Bw5SQ6WDlCK +oRo9vzKU1zZUdCse1r78Zhjc3JCq0A9cA4JBShHkxgRmUdJbjZ8iOeOr+taSor9HueQ Rrimc8kZ9hXSkK9Ddmr3zabG53lQwFfXmR4NQyzOPaOd02f6eTEsK6o7HGl6t1l4vZQM H4dKqoLGtPZeWePti6My3tiFzdh8yWcoEOCAqc6MVAy9aaZO8YEv3yhpb58annW2cj3w +t7Q== X-Received: by 10.152.37.138 with SMTP id y10mr8300014laj.40.1371930032837; Sat, 22 Jun 2013 12:40:32 -0700 (PDT) Received: from opensuse.site (ppp79-139-160-84.pppoe.spdop.ru. [79.139.160.84]) by mx.google.com with ESMTPSA id n3sm3821451lag.9.2013.06.22.12.40.32 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Sat, 22 Jun 2013 12:40:32 -0700 (PDT) Date: Sat, 22 Jun 2013 23:40:31 +0400 From: Andrey Borzenkov To: The development of GNU GRUB Subject: Re: [RFC] Moving from Bazaar (bzr) to git Message-ID: <20130622234031.2f886a3d@opensuse.site> In-Reply-To: References: <1371924016.6521.24.camel@mattotaupa> X-Mailer: Claws Mail 3.9.0 (GTK+ 2.24.18; x86_64-suse-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4010:c03::232 X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.14 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: Sat, 22 Jun 2013 19:40:36 -0000 =D0=92 Sun, 23 Jun 2013 00:09:31 +0530 Keshav Padram =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > On 22 June 2013 23:30, Paul Menzel wro= te: >=20 > > Dear GRUB folks, > > > > > > this is *not* the start of a flame war about what VCS is the best. > > > > Hopefully everyone will agree, that git is the most popular one in the > > FOSS world (Linux, freedesktop.org, GNOME, KDE, =E2=80=A6) and a lot of= people > > are now familiar with the basic git commands. So using Bazaar is one > > more thing to deal with for new contributors before making a > > contribution to GRUB. (I know there is git-bzr-ng, but it is still one > > more step.) > > > > Talking to Vladimir and Colin in #grub, they did not oppose a migration > > to git and Vladimir asked me to bring it up on the list. > > > > Does anyone have experience with such a move and how to do it on > > Savannah? Could you please share these? That would be great. > > > > > I don't have an idea how to do it in Savannah. But you can also use > git-remote-bzr ( > http://felipec.wordpress.com/2012/11/13/git-remote-hg-bzr-2/ ) apart from > git-bzr-ng to checkout bzr repo via git. git-remote-bzr is part of git > contrib scripts and is already shipped as part of git pkg in many distros > (/usr/share/git/remote-helpers/git-remote-bzr in Arch Linux). I currently > use grub bzr via git-remote-bzr. >=20 git-remote-bzr (and git-bzr-ng) are good to keep track of single branch, but they won't replicate existing branches structure of bzr repo. That will probably be the main problem. bzr and git use sufficiently different work flow, so this will likely need to be done manually (scripting). git-remote-bzr does replicated all commits and stores branch tips, which provides enough information to recreate branches in git. OTOH with git often is using repo clones (which are really easy and cheap) for what bzr is using branches. At least people/* branches are good candidates for becoming separate repositories.=20 I also do not know to which extent merge information is compatible between git and bzr and whether this will preserve merge history, assuming this is important.