Changes between Version 5 and Version 6 of QtWebKitGitInstructions


Ignore:
Timestamp:
Sep 28, 2008 11:48:33 AM (14 years ago)
Author:
Simon Hausmann
Comment:

Update to the current branch situation

Legend:

Unmodified
Added
Removed
Modified
  • QtWebKitGitInstructions

    v5 v6  
    11= Branch Overview =
    22
    3 There are four types of branches in the QtWebKit Git repository:
     3There are six types of branches in the QtWebKit Git repository:
    44
    5  * qtwebkit: This is the main development branch. Currently only Lars and Simon can update this branch. If you feel comfortable enough with Git we can add you.
     5 * svn/master: This is the main development line, mirrored straight from SVN trunk. We do our development in trunk.
     6 * qtwebkit-4.5: This branch, based on trunk, contains what we're going to ship with Qt 4.5. No direct development happens in this branch, we only merge from trunk or branches that are scheduled for inclusion into trunk.
    67 * shared/* : Everybody can create/delete/change branches that start with "shared/".
    78 * <username>/* : This is where developers publish their changes. You can have as many so-called topic branches as you like. For example holger/crash-fix would be a name for such a topic branch.
    89 * svn/* such as svn/master or svn/Safari-3-branch. The branches prefixed with svn/ are read-only
    910   and are mirrored from the WebKit Subversion repository.
     11 * qtwebkit: This is the old development branch that contains what is shipped with Qt 4.4.
    1012
    1113= Howto =
     
    2628(Note: Substitute {{{simon/crash-fix}}} accordingly)
    2729
    28  * Create a local topic branch: {{{git checkout -b simon/crash-fix origin/qtwebkit}}}
     30 * Create a local topic branch: {{{git checkout -b simon/crash-fix origin/svn/master}}}
    2931 * After that you will be on a local {{{simon/crash-fix}}} branch.
    3032 * Now you can hack away and commit as many changes as you want.
    3133 * To publish your changes for the first time run the following command: {{{git push origin simon/crash-fix}}}
    3234 * You can continue hacking and if you want to publish more changes you can just run {{{git push}}}
    33  * If you want to merge the latest changes from the {{{qtwebkit}}} branch run this:
     35 * If you want to merge the latest changes from the {{{svn/master}}} branch run this:
    3436{{{
    3537git fetch
    36 git merge origin/qtwebkit
     38git merge origin/svn/master
    3739}}}
    38  * When you are happy with your changes and they have been merged into the {{{qtwebkit}}} branch you can delete your branch on the public repository using {{{git push origin :simon/crash-fix}}}
     40 * When you are happy with your changes and they have been merged into the {{{svn/master}}} branch you can delete your branch on the public repository using {{{git push origin :simon/crash-fix}}}
    3941 * After deleting the branch on the public repository you can also delete it locally:
    40    * Switch to a different branch, such as {{{qtwebkit}}}: {{{git checkout qtwebkit}}}
     42   * Switch to a different branch, such as {{{qtwebkit-4.5}}}: {{{git checkout qtwebkit-4.5}}}
    4143   * Delete the branch: {{{git branch -D simon/crash-fix}}}
    4244
     
    4648
    4749All you have to do is to adjust your {{{origin}}}. Edit the {{{.git/config}}} file and look for the {{{[remote "origin"]}}} section. Change the the {{{url = ...}}} line to read {{{url = git+ssh://git@code.staikos.net/srv/git/webkit}}}
    48