$ cd src && ./build/install-build-deps.sh
@@ -1028,7 +1029,8 @@ directory:diff --git a/man/html/depot_tools_tutorial.html b/man/html/depot_tools_tutorial.html index 6a0d578e3..ffe62c1e1 100644 --- a/man/html/depot_tools_tutorial.html +++ b/man/html/depot_tools_tutorial.html @@ -988,7 +988,7 @@ commands:
$ gclient sync $ # Make a new change and upload it for review -$ git new-branch branchname +$ git new-branch <branch_name> $ # repeat: [edit, git add, git commit] $ git cl upload @@ -1017,7 +1017,8 @@ directory:.gclient # A configuration file for you source checkout
src/ # Top-level Chromium source checkout.
-If you are on linux, then you’ll need to run:
If you are on linux and fetching the code for the first time, then you’ll need +to run:
$ cd src && ./build/install-build-deps.sh
@@ -1028,7 +1029,8 @@ directory:$ gclient sync
This will pull all dependencies of the Chromium src checkout. You will need -to run this any time you update the main src checkout.
src/
folder mentioned in Gettin
Each CL corresponds exactly with a single branch in git. Any time you want to -begin a new CL, just:
$ git new-branch <branch_name>
This will create and checkout a new branch named branch_name
which will track
-the default upstream (which is origin/master
). See git-new-branch(1)
-for more features, such as the ability to track LKGR.
origin/master
). See
+git-new-branch(1) for more features.
Commit as many changes as you like to this branch. When you want to upload it for review, run:
$ git cl upload
This will take the diff of your branch against its upstream (origin/master
),
-and will post it to the Chromium code
-review site.
This will take the diff of your branch against its upstream branch (in that +case origin/master), and will post it to the +Chromium code review site.
gclient sync
to update your dependencies.
Sometimes you want to work on more than one CL at once (say, you have a CL
posted for review and want to work on something else). For each CL that you
-want to work on, just use git new-branch <branchname>
.
git new-branch <branch_name>
.Once you start to have more than one CL at a time, it can be easy to lose your bearings. Fortunately, depot_tools has two tools to help you out:
- This tool just shows you which branches you have in your repo, and thier + This tool just shows you which branches you have in your repo, and their upstream relationship to each other (as well as which branch you have checked out at the moment).
@@ -1236,9 +1238,9 @@ updating, and committing multiple CLs.$ git new-branch fix_typo
$ echo -e '/Banana\ns/Banana/Kuun\nwq' | ed build/whitespace_file.txt
1503
+1501
It was a Domo-Banana.
It was a Domo-Kuun.
-1501
$ git commit -am 'Fix terrible typo.'
[fix_typo 615ffa7] Fix terrible typo.
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -1252,10 +1254,10 @@ It was a Domo-Kuun.
* 2250f53 2014-04-10 ~ ozone: evdev: Filter devices by path
* 33a7a74 2014-04-10 ~ Always output seccomp error messages to stderr
$ git status
-On branch fix_typo
-Your branch is ahead of 'origin/master' by 1 commit.
- (use "git push" to publish your local commits)
-
+# On branch fix_typo
+# Your branch is ahead of 'origin/master' by 1 commit.
+# (use "git push" to publish your local commits)
+#
nothing to commit, working directory clean
$ git cl upload -r domo@chromium.org --send-mail
... truncated output ...
@@ -1271,15 +1273,15 @@ overhead, barely disturbing the thick cigarette smoke. No doubt was left about
when the fan was last cleaned.
EOF
$ git status
-On branch chap2
-Your branch is up-to-date with 'origin/master'.
-
-Changes not staged for commit:
- (use "git add <file>..." to update what will be committed)
- (use "git checkout -- <file>..." to discard changes in working directory)
-
- modified: build/whitespace_file.txt
-
+# On branch chap2
+# Your branch is up-to-date with 'origin/master'.
+#
+# Changes not staged for commit:
+# (use "git add <file>..." to update what will be committed)
+# (use "git checkout -- <file>..." to discard changes in working directory)
+#
+# modified: build/whitespace_file.txt
+#
no changes added to commit (use "git add" and/or "git commit -a")
$ git freeze
$ git checkout fix_typo
@@ -1288,9 +1290,9 @@ Your branch is ahead of 'origin/master' by 1 commit.
(use "git push" to publish your local commits)
$ echo -e '/Kuun\ns/Kuun/Kun\nwq' | ed build/whitespace_file.txt
1501
+1500
It was a Domo-Kuun.
It was a Domo-Kun.
-1500
$ git upstream-diff --wordwise
diff --git a/build/whitespace_file.txt b/build/whitespace_file.txt
index 3eba355..57cdcee 100644
@@ -1579,7 +1581,7 @@ from