[Webkit-unassigned] [Bug 36193] New: git repository seems to be missing a svn revision

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=36193

           Summary: git repository seems to be missing a svn revision
           Product: WebKit
           Version: 528+ (Nightly build)
          Platform: PC
        OS/Version: Mac OS X 10.5
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
        AssignedTo: webkit-unassigned at lists.webkit.org
        ReportedBy: bolsinga at apple.com
                CC: ddkilzer at webkit.org


Here's my git config:
sonic:WebKit bolsinga$ cat .git/config 
[core]
    repositoryformatversion = 0
    filemode = true
    bare = false
    logallrefupdates = true
    editor = ./WebKitTools/Scripts/commit-log-editor
    autocrlf = false
[remote "origin"]
    url = git://git.webkit.org/WebKit.git
    fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
    remote = origin
    merge = refs/heads/master
[svn-remote "svn"]
    url = http://svn.webkit.org/repository/webkit
    fetch = trunk:refs/remotes/trunk

When I git svn rebase, I see:
First, rewinding head to replay your work on top of it...
Applying: 2009-10-20  Mikhail Naganov  <mnaganov at chromium.org>
error: patch failed: WebCore/ChangeLog:1
error: WebCore/ChangeLog: patch does not apply
error: patch failed: WebCore/bindings/v8/V8Binding.h:61
error: WebCore/bindings/v8/V8Binding.h: patch does not apply
error: patch failed:
WebCore/inspector/front-end/BottomUpProfileDataGridTree.js:29
error: WebCore/inspector/front-end/BottomUpProfileDataGridTree.js: patch does
not apply
error: patch failed: WebCore/inspector/front-end/ProfileDataGridTree.js:126
error: WebCore/inspector/front-end/ProfileDataGridTree.js: patch does not apply
error: patch failed:
WebCore/inspector/front-end/TopDownProfileDataGridTree.js:33
error: WebCore/inspector/front-end/TopDownProfileDataGridTree.js: patch does
not apply
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging WebCore/ChangeLog
CONFLICT (content): Merge conflict in WebCore/ChangeLog
Auto-merging WebCore/bindings/v8/V8Binding.h
CONFLICT (content): Merge conflict in WebCore/bindings/v8/V8Binding.h
Auto-merging WebCore/inspector/front-end/BottomUpProfileDataGridTree.js
CONFLICT (content): Merge conflict in
WebCore/inspector/front-end/BottomUpProfileDataGridTree.js
Auto-merging WebCore/inspector/front-end/ProfileDataGridTree.js
Auto-merging WebCore/inspector/front-end/TopDownProfileDataGridTree.js
CONFLICT (content): Merge conflict in
WebCore/inspector/front-end/TopDownProfileDataGridTree.js
Failed to merge in the changes.
Patch failed at 0001 2009-10-20  Mikhail Naganov  <mnaganov at chromium.org>

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

rebase refs/remotes/trunk: command returned error: 1

David Kilzer mentioned there was a missing svn commit. He said it was r49890.
It is in remote/trunk, but not remotes/origin/master.

FWIW, the svn commit above is r50141.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.