From owner-freebsd-hackers@FreeBSD.ORG Mon Oct 3 08:01:29 2011 Return-Path: Delivered-To: hackers@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E6ACC106564A for ; Mon, 3 Oct 2011 08:01:29 +0000 (UTC) (envelope-from fabien.thomas@netasq.com) Received: from work.netasq.com (mars.netasq.com [91.212.116.3]) by mx1.freebsd.org (Postfix) with ESMTP id 5D87B8FC1A for ; Mon, 3 Oct 2011 08:01:28 +0000 (UTC) Received: from [10.2.1.1] (unknown [10.2.1.1]) by work.netasq.com (Postfix) with ESMTPSA id 0CDDE740016; Mon, 3 Oct 2011 10:00:29 +0200 (CEST) Mime-Version: 1.0 (Apple Message framework v1084) Content-Type: text/plain; charset=iso-8859-1 From: Fabien Thomas In-Reply-To: <20110922212602.GS26743@acme.spoerlein.net> Date: Mon, 3 Oct 2011 10:01:27 +0200 Content-Transfer-Encoding: quoted-printable Message-Id: References: <4E712D11.7040202@FreeBSD.org> <4E75B67E.1000802@FreeBSD.org> <20110922190535.GR26743@acme.spoerlein.net> <20110922212602.GS26743@acme.spoerlein.net> To: hackers@freebsd.org X-Mailer: Apple Mail (2.1084) Cc: =?iso-8859-1?Q?Ulrich_Sp=F6rlein?= , Arnaud Lacombe Subject: Re: my git development snapshot(s) X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Oct 2011 08:01:30 -0000 On Sep 22, 2011, at 11:26 PM, Ulrich Sp=F6rlein wrote: > On Thu, 2011-09-22 at 15:52:43 -0400, Arnaud Lacombe wrote: >> Hi, >>=20 >> On Thu, Sep 22, 2011 at 3:05 PM, Ulrich Sp=F6rlein = wrote: >>> On Sun, 2011-09-18 at 12:14:38 +0300, Andriy Gapon wrote: >>>>=20 >>>> Just decided to follow the global trends and trying to throw all of = my >>>> local/private changes at you in hope that the "crowd-sourcing = magic" might >>>> somehow happen :-) This seems definitely easier than carefully = producing the >>>> patch files and keeping them up-to-date. >>>>=20 >>>> So, my newly cloned gitorious repository: >>>> https://gitorious.org/~avg/freebsd/avgbsd >>>>=20 >>>> And the first branch of interest: >>>> https://gitorious.org/~avg/freebsd/avgbsd/commits/devel-20110915 >>>=20 >>> I'll throw mine in as well: >>>=20 >>> https://github.com/uqs/freebsd-head/branches >>>=20 >> is that the same as tree as Fabien's, or a new snapshot ? >>=20 >> If not, couldn't we agree to have all the same tree in order to ease >> code sharing between all of them ? >>=20 >> I see there is already a https://github.com/freebsd/freebsd tree, >> which seem different than Fabien's tree on github. It really look = like >> The FreeBSD Project (https://github.com/freebsd/) is not able to >> provide consistency. >=20 > The freebsd-head tree is the same that everybody in the world can get = by > simply running git svn clone against the FreeBSD subversion server > (you'd need a lot of patience, though). >=20 > It's also available from git.freebsd.your.org and on code.google.com > (except that Google's git backend sucks ass). >=20 > Fabien's tree is cut off at an arbitrary date and if you happen to > choose a different date, well you cannot merge any branches with that > repository. No it was not cut at all it have been made at a time where github dont allow large repo for free. All the branches >=3D 4.11 was in and=20 with full history from rev 1. As Arnaud told me it seems at some point in time that at least stable_8 branch was broken. To be sure there is no other branches like this i've rebuilded the repo and done a git push --force on Gitorious. The effect of merge for people that use it is that git will not successfully merge the tree as the history is not the same (for stable_8 at least). To solve that i've done: git merge -Xtheirs upstream/svn_stable_8 on my reference branch (that dont contain modifications). After that, merging from this branch will be ok. As more and more people use git i hope that at some point in time we will have an official repo hosted on FreeBSD servers. Fabien