From ce42cbeba879811178a8f3d2116218660bf27c2a Mon Sep 17 00:00:00 2001 From: Philipp Hancke Date: Wed, 16 Dec 2020 09:34:57 +0100 Subject: [PATCH] doc: update working-with-native-branches information cherry-picked from https://github.com/webrtc/webrtc-org/pull/242 BUG=webrtc:11266 No-try: true Change-Id: I0fd725d3bd30805416fd8a54f3d7a772772715f0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/197811 Reviewed-by: Mirko Bonadei Commit-Queue: Philipp Hancke Cr-Commit-Position: refs/heads/master@{#32842} --- docs/native-code/development/index.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/native-code/development/index.md b/docs/native-code/development/index.md index 04393a9bb8..3c7a5342da 100644 --- a/docs/native-code/development/index.md +++ b/docs/native-code/development/index.md @@ -134,10 +134,10 @@ $ git branch -r ``` To create a local branch tracking a remote release branch (in this example, -the 43 branch): +the branch corresponding to Chrome M80): ``` -$ git checkout -b my_branch refs/remotes/branch-heads/43 +$ git checkout -b my_branch refs/remotes/branch-heads/3987 $ gclient sync ``` @@ -159,11 +159,13 @@ $ # verify the current branch becomes REMOTE:origin/master The above is untested and unsupported, but it might help. -Commit log for the branch: [https://webrtc.googlesource.com/src/+log/branch-heads/43][m43-log] -To browse it: [https://webrtc.googlesource.com/src/+/branch-heads/43][m43] +Commit log for the branch: [https://webrtc.googlesource.com/src/+log/branch-heads/3987][m80-log] +To browse it: [https://webrtc.googlesource.com/src/+/branch-heads/3987][m80] For more details, read Chromium's [Working with Branches][chromium-work-branches] and [Working with Release Branches][chromium-work-release-branches] pages. +To find the branch corresponding to a Chrome release check the +[Chromium Dashboard][https://chromiumdash.appspot.com/branches]. ## Contributing Patches @@ -264,5 +266,5 @@ Target name `turnserver`. Used for unit tests. [depot-tools]: http://commondatastorage.googleapis.com/chrome-infra-docs/flat/depot_tools/docs/html/depot_tools_tutorial.html#_setting_up [rfc-5389]: https://tools.ietf.org/html/rfc5389 [rfc-5766]: https://tools.ietf.org/html/rfc5766 -[m43-log]: https://webrtc.googlesource.com/src/+log/branch-heads/43 -[m43]: https://webrtc.googlesource.com/src/+/branch-heads/43 +[m80-log]: https://webrtc.googlesource.com/src/+log/branch-heads/3987 +[m80]: https://webrtc.googlesource.com/src/+/branch-heads/3987