Changes between Version 30 and Version 31 of UsingGitWithWebKit


Ignore:
Timestamp:
Aug 13, 2009 8:25:18 AM (12 years ago)
Author:
treat@kde.org
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • UsingGitWithWebKit

    v30 v31  
    5656}}}
    5757
     58== Commit through git svn ==
     59
     60If you have been granted commit access to WebKit's svn repository it is possible to work entirely with git and still commit through git svn.
     61
     62First, you'll need to make sure you have the appropriate remote in your git config:
     63
     64{{{
     65[svn-remote "svn"]
     66    url = http://svn.webkit.org/repository/webkit/trunk
     67    fetch = :refs/remotes/git-svn
     68}}}
     69
     70Now, you need to update your repo to the latest from the svn repository.  You can either:
     71
     72 * Run 'git svn rebase' which will be incredibly slow...
     73 * Use the {{{git update-ref}}} trick manually as mentioned above...
     74 * Use the handy {{{update-gitsvn-from-origin}}} script found in the QtWebKit tools repository here: http://gitorious.org/qtwebkit/tools
     75
     76After you have a working remote and have fetched all the blobs of info from it you can:
     77 1. Create a 'tot_staging' branch or whatever name you choose
     78 2. Apply a patch, cherry-pick a commit, or even merge a branch if it has been reviewed
     79 3. Run {{{git svn rebase}}} and fix any ChangeLog conflicts that might result
     80 4. And then when everything is ready: {{{git svn dcommit}}}
    5881
    5982== WebKit Script support for Git ==