I copied the output to here: http://romaneric.googlepages.com/webkit-merge-log.txt
It is ~4mb On Mon, Sep 29, 2008 at 8:42 PM, e. roman <[EMAIL PROTECTED]> wrote: > The changelog is substantial > (over 100,000 lines of commit logs) > > Since the Safaro 3.1 branch originated from [EMAIL PROTECTED], and we are > merging to [EMAIL PROTECTED], you can view the changelogs with: > > % svn log http://svn.webkit.org/repository/webkit/trunk -r30073:36102 > > In fact this is a superset of the changes, to be accurate you should > subtract out these revisions: > > r30075, r30076, r30077, r30078, r30079, r30080, r30081, r30084, > r30085, r30086, r30087, r30096, r30097, r30098, r30101, r30104, > r30105, r30112, r30113, r30114, r30115, r30116, r30119, r30120, > r30146, r30153, r30154, r30157, r30158, r30162, r30171, r30172, > r30173, r30174, r30176, r30177, r30179, r30184, r30189, r30190, > r30191, r30195, r30206, r30212, r30213, r30218, r30222, r30233, > r30235, r30237, r30238, r30239, r30240, r30241, r30242, r30269, > r30276, r30285, r30320, r30323, r30325, r30326, r30328, r30329, > r30330, r30331, r30370, r30389, r30392, r30395, r30399, r30400, > r30422, r30423, r30433, r30458, r30461, r30472, r30475, r30480, > r30489, r30492, r30493, r30617, r30634, r30677, r30689, r30692, > r30716, r30722, r30992, r31015, r31069, r31071, r31144, r31153, > r31236, r31320, r31336, r31358, r31388, r31420, r31434, r31438, > r34154, r34204 > > (which got merged into 3.1 branch) > > On Mon, Sep 29, 2008 at 8:09 PM, Eric Seidel <[EMAIL PROTECTED]> wrote: >> >> Not really. >> >> We are merging in a forked copy of WebKit based on WebKit r36102 from >> webkit.org. >> http://trac.webkit.org/browser/trunk?rev=36102 >> >> Previously our WebKit was based off of: >> http://trac.webkit.org/browser/branches/Safari-3-1-branch >> >> -eric >> >> On Mon, Sep 29, 2008 at 7:26 PM, Marshall Greenblatt >> <[EMAIL PROTECTED]> wrote: >>> Hi Eric, >>> >>> Is there a document somewhere that describes the changes that we can expect? >>> >>> Regards, >>> Marshall >>> >>> On Mon, Sep 29, 2008 at 6:00 PM, Eric Seidel <[EMAIL PROTECTED]> wrote: >>>> >>>> We plan to land the webkit_merge_branch onto trunk tomorrow afternoon. >>>> http://src.chromium.org/svn/branches/chrome_webkit_merge_branch/ >>>> >>>> We still have a bunch of failures: >>>> >>>> http://build.chromium.org/buildbot/waterfall/waterfall?builder=Webkit%20(merge) >>>> but we plan to mark all failing tests as "fixable" so that the bot >>>> will be green, and then work to fix the failing tests once the code is >>>> in trunk. >>>> >>>> We plan to fix all 17 remaining crashing tests between now and when we >>>> land on trunk. >>>> >>>> This means that trunk will be closed for 1-2 hours tomorrow afternoon. >>>> >>>> This merge has been 9 weeks in the making, it's time for us to finally >>>> move it onto trunk and work with the whole team to fix our remaining >>>> issues. Thank you for your understanding in this issue. >>>> >>>> -eric >>>> >>>> >>> >>> >>> > >>> >> >> >> >> > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Chromium-dev" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [EMAIL PROTECTED] For more options, visit this group at http://groups.google.com/group/chromium-dev?hl=en -~----------~----~----~----~------~----~------~--~---
