[webkit-dev] git.webkit.org/WebKit.git out of sync from svn repository?

Mark Rowe mrowe at apple.com
Fri Nov 6 13:18:30 PST 2009


On 2009-11-05, at 20:32, Fumitoshi Ukai (鵜飼文敏) wrote:

> I think svn has r50586 (accodring to trac.webkit.org), but git only pulls r50565now.
> Even I clone git repository from git://git.webkit.org/WebKit.git again, it only has r50565.
> Is it out of sync?

It seems fine to me.

mrowe at angara:~$ git clone git://git.webkit.org/WebKit.git WebKit
Initialized empty Git repository in /Volumes/Data/Users/mrowe/WebKit/.git/
remote: Counting objects: 593853, done.
remote: Compressing objects: 100% (101931/101931), done.
remote: Total 593853 (delta 468182), reused 593646 (delta 468045)
Receiving objects: 100% (593853/593853), 655.06 MiB | 33.53 MiB/s, done.
Resolving deltas: 100% (468182/468182), done.
Checking out files: 100% (55327/55327), done.
mrowe at angara:~$ cd WebKit/
mrowe at angara:~/WebKit$ git log -n1 master
commit 588e7c8cc95b6f070fa6e0a860b86f783a0ecaef
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 6 20:01:14 2009 +0000

    2009-11-06  Steve Block  <steveblock at google.com>
    
            Reviewed by Eric Seidel.
    
            V8DOMWindowCustom.cpp is missing WEB_SOCKETS guard on include.
            https://bugs.webkit.org/show_bug.cgi?id=31209
    
            Build fix only. No new tests possible.
    
            * bindings/v8/custom/V8DOMWindowCustom.cpp: Modified. Added WEB_SOCKETS guard on inclue of WebSockets.h.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50603 268f45cc-cd09-0410-ab3c-d52691b4dbfc
mrowe at angara:~/WebKit$ 


> % git pull
> Already up-to-date.
> % git log -1 HEAD  
> commit 968141f94cc10ea755eebcdf08882a4253a2cd2d
> Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
> 
> Date:   Thu Nov 5 16:42:45 2009 +0000
>     
>     git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50565 268f45cc-cd0
> 9-0410-ab3c-d52691b4dbfc

Your looking at the most recent revision on your current branch, but there's nothing in this output that shows what branch you currently have checked out.  Does "git fetch origin && git log -n1 origin/master" display a different revision?

- Mark

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-dev/attachments/20091106/7fca75b9/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3166 bytes
Desc: not available
URL: <http://lists.webkit.org/pipermail/webkit-dev/attachments/20091106/7fca75b9/attachment.bin>


More information about the webkit-dev mailing list