Date: Mon, 3 Oct 2011 10:01:27 +0200 From: Fabien Thomas <fabien.thomas@netasq.com> To: hackers@freebsd.org Cc: =?iso-8859-1?Q?Ulrich_Sp=F6rlein?= <uqs@spoerlein.net>, Arnaud Lacombe <lacombar@gmail.com> Subject: Re: my git development snapshot(s) Message-ID: <D7D7ECF8-E08A-4141-B08D-88118D894939@netasq.com> In-Reply-To: <20110922212602.GS26743@acme.spoerlein.net> References: <4E712D11.7040202@FreeBSD.org> <4E75B67E.1000802@FreeBSD.org> <20110922190535.GR26743@acme.spoerlein.net> <CACqU3MVgQkV8q1wJQg2igECMYkPioxTjSmYSq-EGPvuoCNUu5g@mail.gmail.com> <20110922212602.GS26743@acme.spoerlein.net>
next in thread | previous in thread | raw e-mail | index | archive | help
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 = <uqs@spoerlein.net> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?D7D7ECF8-E08A-4141-B08D-88118D894939>