From owner-freebsd-arch@FreeBSD.ORG Sat Aug 27 15:59:41 2011 Return-Path: Delivered-To: freebsd-arch@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B8C2C106564A for ; Sat, 27 Aug 2011 15:59:41 +0000 (UTC) (envelope-from ulrich@spoerlein.net) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by mx1.freebsd.org (Postfix) with ESMTP id 00D818FC12 for ; Sat, 27 Aug 2011 15:59:40 +0000 (UTC) Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by acme.spoerlein.net (8.14.4/8.14.4) with ESMTP id p7RFxYqO074601 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 27 Aug 2011 17:59:34 +0200 (CEST) (envelope-from ulrich@spoerlein.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=spoerlein.net; s=dkim200908; t=1314460775; bh=F8dcqrn2NEMnxJP+S06hm0LXXOhL7KbyDafZBO99Y6Q=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Transfer-Encoding:In-Reply-To; b=kVorHtHNMUATadyUvw+6uf+RLCXQd2z2Qtzf26ddYvhXGLDdUYK4UoWHZ9uF+ZNPI W7Jpa3HK/8irvoC3+wos5qGfnYFKEunD7fnSqkipumv09++kse4NXQVk0ajgT9kHD6 oGN7760yMiR1m5XxFYjEwV4LYiNDJmjgNTFocxkA= Date: Sat, 27 Aug 2011 17:59:34 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Gleb Kurtsou Message-ID: <20110827155934.GQ18091@acme.spoerlein.net> Mail-Followup-To: Gleb Kurtsou , Jonathan Anderson , vadim_nuclight@mail.ru, mdf@freebsd.org, Adrian Chadd , Robert Watson , freebsd-arch@freebsd.org References: <20110826183130.GA40586@tops> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20110826183130.GA40586@tops> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: mdf@freebsd.org, Adrian Chadd , Jonathan Anderson , vadim_nuclight@mail.ru, Robert Watson , freebsd-arch@freebsd.org Subject: Re: Official git export (was: Re: FreeBSD problems and preliminary ways to solve) X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Aug 2011 15:59:41 -0000 On Fri, 2011-08-26 at 21:31:31 +0300, Gleb Kurtsou wrote: > On (26/08/2011 12:43), Jonathan Anderson wrote: > > On 26 August 2011 12:23, Robert Watson wrote: > > > Per my earlier comments, I think we've reached the juncture where a > > > "blessed" svn2git export would be extremely helpful. > > > > > > [...] > > > > > > I suspect quite a bit will end up in github just due to its accessibility, > > > but hosting our own is certainly also an option.  In some sense, this > > > strikes me as secondary to establishing some of the details about how to > > > prepare patches, known nits, and having an authoritative origin. > > > > Indeed, that's the beauty of Git, that the repositories will all play > > nicely together, no matter where they're hosted or what the "chain of > > custody" is, but they do need to come from the "right" source. > > > > I just hope that the consensus solidifies around the freebsd.git repo > > that your.org hosts, rather than the freebsd-head.git one that > > your.org, github and gitorious all have, because your.org's > > freebsd.git has *all* of the SVN branches, including releases, vendor > > branches, user projects, etc., whereas the others only have > > [variously] -CURRENT or a smattering of release branches. The key part here is svn integration. git-svn has this, but it does not cope with the huge history we have in the tree. Furthermore git-svn can/should be run be the individual committers and focusing on the main branch just makes the most sense. Especially, considering that you shouldn't use git-svn to merge changes from head to stable/* (blame the fucked up SVN merge mechanism). Thus, it's best to not even give committers the stable branches in their git trees, lest they mess up the svn repo. And it's really easy to push hundreds of commits from git to svn with one command. And we all make mistakes ... > I'd also prefer your.org style repository with all branches. your.org > branch layout is much better than http://gitorious.org/freebsd/freebsd Please use http://gitorious.org/freebsd/freebsd-head if you want a committer to actually take your patches and submit them into svn (using git-svn). > The only thing that bothers me is that no repository includes full user > names, hopefully it would be fixed in official git repo. No. I really would like to see the full names too, and actually put a lot of work into getting the correct names into the git repos in the first place. Alas it is too fragile and will break too often as the login -> full name mapping is not fixed (yay! we still get new people!) As part of using git-svn to push stuff upstream, it will first download and convert the svn head, rebase your patches and then send them as incremental commits. The "download and convert" part would require that each and every committer has the same, up-to-date, list of loginnames to email-addresses. This will break and the benefit is far too little anyway. Should a full conversion be done at some point (ha! last I heard our re@ folks are still using CVS ...), this can be reconsidered and fixed up easily. > Jonathan, could you update /Git wiki page with an example of git clone > specifying only head branch and how to add another branch later. That > would make local repository copy smaller, pull faster and > 'git branch -r' output much shorter. I'm fully to blame for the lack of documentation on a working git workflow. I shall review what's in the Wiki and come up with an overview of what' what. Cheers, Uli