Commit 2e01d540 by Shannon Woods

More formatting fixes.

Change-Id: I8ff32a61362e5329c922ec696ba69480145f316a Reviewed-on: https://chromium-review.googlesource.com/311081Reviewed-by: 's avatarShannon Woods <shannonwoods@chromium.org> Tested-by: 's avatarShannon Woods <shannonwoods@chromium.org>
parent 64b88609
...@@ -12,16 +12,16 @@ Chromium's dependency on third-party projects is tracked in [the Chromium ...@@ -12,16 +12,16 @@ Chromium's dependency on third-party projects is tracked in [the Chromium
repository's src/DEPS file] repository's src/DEPS file]
(http://src.chromium.org/viewvc/chrome/trunk/src/DEPS). To update the ANGLE (http://src.chromium.org/viewvc/chrome/trunk/src/DEPS). To update the ANGLE
dependency: dependency:
* Find the line in this file that defines "src/third\_party/angle" * Find the line in this file that defines "src/third\_party/angle"
for deps (**not** deps\_os) for deps (**not** deps\_os)
* Change the [git SHA-1 revision number] * Change the [git SHA-1 revision number]
(http://git-scm.com/book/ch6-1.html) to be that of the commit on which Chromium (http://git-scm.com/book/ch6-1.html) to be that of the commit on which Chromium
should depend. Please use the full SHA-1, not a shortened version. should depend. Please use the full SHA-1, not a shortened version.
* You can * You can
find the SHA-1 for a particular commit with `git log` on the appropriate branch find the SHA-1 for a particular commit with `git log` on the appropriate branch
of the repository, or via [the public repository viewer] of the repository, or via [the public repository viewer]
(https://chromium.googlesource.com/angle/angle). (https://chromium.googlesource.com/angle/angle).
* If using the public repository viewer, you will need to select the branch whose log you wish to view * If using the public repository viewer, you will need to select the branch whose log you wish to view
from the list on the left-hand side, and then click on the "tree" link at the from the list on the left-hand side, and then click on the "tree" link at the
top of the resulting page. Alternatively, you can navigate to top of the resulting page. Alternatively, you can navigate to
`https://chromium.googlesource.com/angle/angle/+/<branch name>/` -- including `https://chromium.googlesource.com/angle/angle/+/<branch name>/` -- including
...@@ -37,17 +37,17 @@ incorporate only these changes, and not everything that has been committed since ...@@ -37,17 +37,17 @@ incorporate only these changes, and not everything that has been committed since
the version on which Chrome depended at branch time. **Please note: Only ANGLE the version on which Chrome depended at branch time. **Please note: Only ANGLE
admins can create a new branch.** To create a branch of ANGLE for a branched admins can create a new branch.** To create a branch of ANGLE for a branched
Chrome release: Chrome release:
* Determine what the ANGLE dependency is for the Chrome release * Determine what the ANGLE dependency is for the Chrome release
by checking the DEPS file for that branch. by checking the DEPS file for that branch.
* Check out this commit as a new branch in your local repository. * Check out this commit as a new branch in your local repository.
* e.g., for [the Chrome 34 release at chrome/branches/1847] * e.g., for [the Chrome 34 release at chrome/branches/1847]
(http://src.chromium.org/viewvc/chrome/branches/1847/src/DEPS), the ANGLE (http://src.chromium.org/viewvc/chrome/branches/1847/src/DEPS), the ANGLE
version is 4df02c1ed5e97dd54576b06964b1da67ea30238e. To check this commit out version is 4df02c1ed5e97dd54576b06964b1da67ea30238e. To check this commit out
locally and create a new branch named 'mybranch' from this commit, use: ```git locally and create a new branch named 'mybranch' from this commit, use: ```git
checkout -b mybranch 4df02c1ed5e97dd54576b06964b1da67ea30238e``` checkout -b mybranch 4df02c1ed5e97dd54576b06964b1da67ea30238e```
* To create this new branch in the public repository, you'll need to push the * To create this new branch in the public repository, you'll need to push the
branch to the special Gerrit reference location, 'refs/heads/<branch name>'. You branch to the special Gerrit reference location, 'refs/heads/<branch name>'. You
must be an ANGLE administrator to be able to push this new branch. must be an ANGLE administrator to be able to push this new branch.
* e.g., to use your local 'mybranch' to create a branch in the public repository called * e.g., to use your local 'mybranch' to create a branch in the public repository called
'chrome\_m34', use: ```git push origin mybranch:refs/heads/chrome_m34``` 'chrome\_m34', use: ```git push origin mybranch:refs/heads/chrome_m34```
* The naming convention that ANGLE uses for its release-dedicated branches is 'chrome\_m##'. * The naming convention that ANGLE uses for its release-dedicated branches is 'chrome\_m##'.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment