Changes between Version 20 and Version 21 of CommitterTips
- Timestamp:
- Mar 3, 2011, 6:39:37 AM (14 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
CommitterTips
v20 v21 43 43 When using "svn commit" to submit a patch, the commit message should be the ChangeLog message(s) for the patch. WebKit maintains a script called "commit-log-editor" that populates the commit message for you. To configure the editor that commit-log-editor opens, you can set the SVN_LOG_EDITOR environment variable to the editor of your choice (e.g. nano). See the commit-log-editor source code [http://trac.webkit.org/browser/trunk/Tools/Scripts/commit-log-editor] for alternative options and to see how commit-log-editor decides what editor to use. 44 44 45 3. '''Apply the patch to your local checkout.''' 45 3. '''Set up Subversion.''' 46 47 Subversion has a handy feature called `auto-props` that will ensure that new binary files you add to the repository are given the correct MIME type. To set this up, find the following two lines in `~/.subversion/config` and uncomment them: 48 49 {{{ 50 enable-auto-props = yes 51 52 *.png = svn:mime-type=image/png 53 }}} 54 55 Note that this will work even if you use `git-svn` to commit changes to WebKit. 56 57 4. '''Apply the patch to your local checkout.''' 46 58 47 59 Use the "svn-apply" script to apply the patch to your local checkout. Make sure the date and reviewer are correct in the ChangeLogs (e.g. by using the -r|--reviewer flag). Alternatively, if the patch has been submitted to [http://bugs.webkit.org], you can use "webkit-patch apply-from-bug". This script will find the patch and set the reviewer for you. 48 60 49 4. '''Update your local checkout, if necessary.'''61 5. '''Update your local checkout, if necessary.''' 50 62 51 63 If time has elapsed since applying the patch to your local checkout, you may need to update your checkout with the latest repository changes. If an update causes a conflict in any ChangeLog files, you can use the resolve-ChangeLogs script to quickly resolve these conflicts and ensure that your ChangeLog changes are at the top. … … 53 65 Alternatively, you can use the "update-webkit" script, which is smart enough to run resolve-ChangeLogs automatically, if necessary. 54 66 55 5. '''Commit the changes.'''67 6. '''Commit the changes.''' 56 68 57 69 Use the following command to commit changes-- … … 68 80 '''Note:''' The first time you commit, your SVN client may not pass your correct username (unless you use the --username option). In this case, simply hit enter at the first password prompt. This will cause a username prompt to appear and then a subsequent password prompt. For the username prompt, type in the username you registered in [http://trac.webkit.org] above (i.e. your account e-mail address). Your username will then be cached for future uses of the client. 69 81 70 6. '''Register the commit in bugs.webkit.org.'''82 7. '''Register the commit in bugs.webkit.org.''' 71 83 72 84 If you are committing a patch in [http://bugs.webkit.org], you should add a comment to the report with text like the following: … … 76 88 Then change the status of the report to RESOLVED. 77 89 78 7. '''Make sure you didn't break anything.'''90 8. '''Make sure you didn't break anything.''' 79 91 80 92 Monitor [http://build.webkit.org/console] to make sure your patch doesn't turn any of the buildbots red!
