Date: Tue, 20 Sep 2011 10:11:34 -0400 From: Arnaud Lacombe <lacombar@gmail.com> To: Fabien Thomas <fabien.thomas@netasq.com> Cc: hackers@freebsd.org, Fabien Thomas <fabient@freebsd.org>, Andriy Gapon <avg@freebsd.org> Subject: Re: my git development snapshot(s) Message-ID: <CACqU3MWqp-E--d66q98wdh=i8_OhS3%2BuM6U5=5Za%2BL%2BRrNHx6g@mail.gmail.com> In-Reply-To: <3C53D349-6629-48FC-A8EF-84C3B2C13617@netasq.com> References: <4E712D11.7040202@FreeBSD.org> <4E75B67E.1000802@FreeBSD.org> <CACqU3MUVJ%2BhmNKLGXaT1W3tUQjXc2PL3qSAJ3ni0UzKbXVc3Wg@mail.gmail.com> <3C53D349-6629-48FC-A8EF-84C3B2C13617@netasq.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi, On Tue, Sep 20, 2011 at 4:58 AM, Fabien Thomas <fabien.thomas@netasq.com> w= rote: > > On Sep 20, 2011, at 6:58 AM, Arnaud Lacombe wrote: > >> Hi, >> >> [adding Fabien Thomas to the CC: list] >> >> On Sun, Sep 18, 2011 at 5:14 AM, Andriy Gapon <avg@freebsd.org> wrote: >>> >>> 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" mi= ght >>> somehow happen :-) =A0This seems definitely easier than carefully produ= cing the >>> patch files and keeping them up-to-date. >>> >>> So, my newly cloned gitorious repository: >>> https://gitorious.org/~avg/freebsd/avgbsd >>> >> I see that this tree is a clone of: >> >> https://gitorious.org/freebsd/freebsd >> >> One issue I've got with that tree, is that it is not usable for any >> serious work because of the following: > > I'm working seriously with it :D > he, I guess we do not have the same kind of workflow :) In my case, I was trying a tree from 7-STABLE into 8-STABLE. >> >> % git merge-base origin/master origin/svn_stable_8 >> % echo $? >> 1 >> > That's strange: > # git merge-base origin/master origin/svn_stable_8 > 08b4e774d45547b6476807eacbfc1d2b5aab02e2 > > I've tried from fresh fresh clone with same result. > You will see this issue online too: https://gitorious.org/freebsd/freebsd/commits/svn_release_8_0_0?page=3D8 https://gitorious.org/freebsd/freebsd/commits/svn_release_8_1_0?page=3D82 https://gitorious.org/freebsd/freebsd/commits/svn_releng_8_0?page=3D8 https://gitorious.org/freebsd/freebsd/commits/svn_releng_8_1?page=3D82 There is no history before commit 47c9e1c. https://gitorious.org/freebsd/freebsd/commits/svn_releng_8_2?page=3D3 There is no history before commit aca2adc. Now, compare with 7.x branches: https://gitorious.org/freebsd/freebsd/commits/svn_releng_7_0?page=3D776 https://gitorious.org/freebsd/freebsd/commits/svn_releng_7_1?page=3D858 https://gitorious.org/freebsd/freebsd/commits/svn_releng_7_3?page=3D928 https://gitorious.org/freebsd/freebsd/commits/svn_releng_7_4?page=3D963 All have exactly the same root commit: d4a6bb6. I'm trying a new clone now, I'll let you know the result... - Arnaud >> The whole FreeBSD 8.x branch is on its own. However: >> >> % git merge-base origin/master origin/svn_stable_7 >> bdad8b50a25980737a8e00047f41fc1e588fc9e5 >> >> % git show bdad8b50a25980737a8e00047f41fc1e588fc9e5 >> commit bdad8b50a25980737a8e00047f41fc1e588fc9e5 >> Author: obrien <obrien@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> >> Date: =A0 Wed Oct 10 16:59:14 2007 +0000 >> >> =A0 =A0For 7.0 make the shared lib "version" '3'. >> =A0 =A0Approved by: =A0 =A0 =A0 =A0re(kensmith) >> >> =A0 =A0git-svn-id: svn://svn.freebsd.org/base/head@172505 >> ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f >> >> So something should have gone wrong when the mirror was created with >> the 8-STABLE branch as its root commit is: > > # git log origin/svn_stable_8 > commit 46c8a8db6dae5c885c7c1de5d39904566cc19685 > Author: ume <ume@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> > Date: =A0 Sun Sep 13 11:34:33 2009 +0000 > > =A0 =A0MFC r196475: > =A0 =A0 - Add AS lookup functionality to traceroute6(8) as well. > =A0 =A0 - Support for IPv6 transport for AS lookup. > =A0 =A0 - Introduce $RA_SERVER to set whois server. > =A0 =A0 - Support for 4 byte ASN. > =A0 =A0 - ANSIfy function declaration in as.c. > > =A0 =A0Approved by: =A0 =A0 =A0 =A0re (kib) > > > =A0 =A0git-svn-id: http://svn.freebsd.org/base/stable/8@197158 ccf9f872-a= a2e-dd11-9fc8-001c23d0bc1f > >> >> commit 47c9e1cbe6e19ab62a112f67fa4baf081aa213be >> Author: jfv <jfv@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> >> Date: =A0 Fri Sep 4 22:37:03 2009 +0000 >> >> =A0 =A0This patch seperates the control of header split from LRO (which = it >> =A0 =A0was previously dependent on), LRO gets turned off when bridging b= ut >> =A0 =A0its been found that header split is still a performance win in th= at case. >> >> =A0 =A0Secondly, there was some interface specific control in stats code= that >> =A0 =A0has been missing, and a logic error that resulted in bogus report= ing. >> =A0 =A0Thanks to Manish and John of LineRateSystems for the report and h= elp in >> =A0 =A0this code. >> >> =A0 =A0Approved by: re >> >> =A0 =A0git-svn-id: http://svn.freebsd.org/base/stable/8@196843 >> ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f >> >> which should rather be: >> >> commit d4a6bb6e18d2601fe08d76be4610ae4a303574b2 >> Author: ache <ache@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> >> Date: =A0 Fri Jan 21 13:31:02 2005 +0000 >> >> =A0 =A0Whitespace/style tweaking of prev. commit. >> >> =A0 =A0Noted by: =A0 =A0 =A0 bde >> >> =A0 =A0git-svn-id: svn://svn.freebsd.org/base/head@140577 >> ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f >> >> >> Regards, >> - Arnaud >> >>> And the first branch of interest: >>> https://gitorious.org/~avg/freebsd/avgbsd/commits/devel-20110915 >>> >>> This is a snapshot of almost all of my local changes to the FreeBSD src= tree. >>> Please note that the branch is not intended to be public in the git sen= se. =A0That >>> is, there will be no linear history - I periodically rebase my changes = on top of >>> the svn head and also frequently reshuffle/merge/split commits. >>> The snapshot is not tidied up, there are quite a few commits that shoul= d be >>> merged into other commits, some commit messages are not accurate/pretty= , etc. >>> The older the commits, the more mature they are supposed to be. >>> >>> Based on the above, no new commits are expected to this snapshot branch= . >>> I will produce new snapshot branches from time to time. >>> >>> I am posting this information to this list initially, later I plan to s= hare the >>> code with the wider audience e.g. via hackers@. >>> >>> P.S. This code sharing is made easier for me by git, Gitorious and "git= rebase >>> --onto" in particular. =A0Thanks to Fabien Thomas for the initial FreeB= SD clone >>> repository at Gitorious! >>> >>> -- >>> Andriy Gapon >>> _______________________________________________ >>> freebsd-hackers@freebsd.org mailing list >>> http://lists.freebsd.org/mailman/listinfo/freebsd-hackers >>> To unsubscribe, send any mail to "freebsd-hackers-unsubscribe@freebsd.o= rg" >>> > > -- > Fabien Thomas > > > > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CACqU3MWqp-E--d66q98wdh=i8_OhS3%2BuM6U5=5Za%2BL%2BRrNHx6g>