Great discussion :-)

On 12 February 2013 11:11, Grant Likely <grant.lik...@secretlab.ca> wrote:
> On Feb 1, 2013 Jordan Justen wrote:
>> On Fri, Feb 1, 2013 at 11:33 AM, Olivier Martin <olivier.mar...@arm.com> 
>> wrote:
>> > Linaro maintains their own git-svn service:
>> > http://git.linaro.org/gitweb?p=mirror/edk2/edk2.git;a=summary
>>
>> Andrew,
>>
>> While I agree with you that git-svn is a great thing for working with
>> svn, here is another example of how git-svn is so close, yet so far...
>>
>> It looks as though they are using an independent git-svn mirror.
>>
>> Thus their r14118 is not the same as our mirror's r14118:
>> https://github.com/tianocore/edk2/commit/c9e8881516a1a09a5f4b19d459710286524bcda8
>> http://git.linaro.org/gitweb?p=mirror/edk2/edk2.git;a=commit;h=51b74ef3738e7f33b4f93878a3b40cab9254230c
>
> Yup, we know about that and it is a problem. We're going to respin the
> Linaro UEFI tree to use the same git-svn mirror.... My assumption was
> that this is the tree to use:
>
> http://tianocore.git.sourceforge.net/git/gitweb.cgi?p=tianocore/edk2;a=summary
>
> Is that correct? It appears to have the same base as the github tree
> you quoted above.
>

That is the tree I'm using for my uefi-next.git tree these days.  So,
as I'm only pinned to 14107 at the moment, I can see that 14107 has
the same SHA1 id in both sourcefroge, github and my tree:

http://tianocore.git.sourceforge.net/git/gitweb.cgi?p=tianocore/edk2;a=commit;h=1e43cdfdd470dd3773e9b6b39be8a867d28f546e
https://github.com/tianocore/edk2/commit/1e43cdfdd470dd3773e9b6b39be8a867d28f546e
http://git.linaro.org/gitweb?p=arm/uefi/uefi-next.git;a=commit;h=1e43cdfdd470dd3773e9b6b39be8a867d28f546e

I only use the Linaro GIT mirror of FatDriver2.  And I only use that
because there is no sourceforge GIT tree to pull from.


>> This mismatch generally makes sharing changes/trees more difficult,
>> and thus is a point in favor of git vs. git-svn.
>
> s/more difficult/impossible/  The git mirrors become basically
> read-only w.r.t. the mainline tree. You cannot apply anything to the
> git tree and do a round trip out to the mainline svn tree. It needs to
> be respun to bring anything back in.
>
> g.

------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/edk2-devel

Reply via email to