Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(447)

Side by Side Diff: man/man7/depot_tools_tutorial.7

Issue 2162223003: [Docs] Remove mention of the 'blink' fetch recipe, and re-run asciidoc. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master
Patch Set: revert unrelated changes Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « man/html/depot_tools_tutorial.html ('k') | man/src/depot_tools_tutorial.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 '\" t 1 '\" t
2 .\" Title: depot_tools_tutorial 2 .\" Title: depot_tools_tutorial
3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author] 3 .\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> 4 .\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
5 .\" Date: 01/13/2015 5 .\" Date: 07/20/2016
6 .\" Manual: Chromium depot_tools Manual 6 .\" Manual: Chromium depot_tools Manual
7 .\" Source: depot_tools 379a889 7 .\" Source: depot_tools 5ef2ca1
8 .\" Language: English 8 .\" Language: English
9 .\" 9 .\"
10 .TH "DEPOT_TOOLS_TUTORIAL" "7" "01/13/2015" "depot_tools 379a889" "Chromium depo t_tools Manual" 10 .TH "DEPOT_TOOLS_TUTORIAL" "7" "07/20/2016" "depot_tools 5ef2ca1" "Chromium depo t_tools Manual"
11 .\" ----------------------------------------------------------------- 11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff 12 .\" * Define some portability stuff
13 .\" ----------------------------------------------------------------- 13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673 15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html 16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq 18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq ' 19 .el .ds Aq '
20 .\" ----------------------------------------------------------------- 20 .\" -----------------------------------------------------------------
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 .\} 254 .\}
255 .sp 255 .sp
256 .SH "TL;DR" 256 .SH "TL;DR"
257 .sp 257 .sp
258 .if n \{\ 258 .if n \{\
259 .RS 4 259 .RS 4
260 .\} 260 .\}
261 .nf 261 .nf
262 \fB$\fR # get the code 262 \fB$\fR # get the code
263 \fB$\fR # In an empty directory: 263 \fB$\fR # In an empty directory:
264 \fB$ fetch {chromium,blink,\&.\&.\&.}\fR 264 \fB$ fetch {chromium,\&.\&.\&.}\fR
265 265
266 \fB$\fR # Update third_party repos and run pre\-compile hooks 266 \fB$\fR # Update third_party repos and run pre\-compile hooks
267 \fB$ gclient sync\fR 267 \fB$ gclient sync\fR
268 268
269 \fB$\fR # Make a new change and upload it for review 269 \fB$\fR # Make a new change and upload it for review
270 \fB$ git new\-branch <branch_name>\fR 270 \fB$ git new\-branch <branch_name>\fR
271 \fB$\fR # repeat: [edit, git add, git commit] 271 \fB$\fR # repeat: [edit, git add, git commit]
272 \fB$ git cl upload\fR 272 \fB$ git cl upload\fR
273 273
274 \fB$\fR # After change is reviewed, commit with the CQ 274 \fB$\fR # After change is reviewed, commit with the CQ
275 \fB$ git cl set_commit\fR 275 \fB$ git cl set_commit\fR
276 \fB$\fR # Note that the committed hash which lands will /not/ match the 276 \fB$\fR # Note that the committed hash which lands will /not/ match the
277 \fB$\fR # commit hashes of your local branch\&. 277 \fB$\fR # commit hashes of your local branch\&.
278 .fi 278 .fi
279 .if n \{\ 279 .if n \{\
280 .RE 280 .RE
281 .\} 281 .\}
282 .sp 282 .sp
283 .SH "GETTING THE CODE" 283 .SH "GETTING THE CODE"
284 .sp 284 .sp
285 Pick an empty directory and run one of the following: 285 Pick an empty directory and run one of the following:
286 .sp 286 .sp
287 .if n \{\ 287 .if n \{\
288 .RS 4 288 .RS 4
289 .\} 289 .\}
290 .nf 290 .nf
291 \fB$ fetch chromium\fR # Basic checkout for desktop Chromium 291 \fB$ fetch chromium\fR # Basic checkout for desktop Chromium
292 \fB$ fetch blink\fR # Chromium code with Blink checked out to tip\-of\-tree
293 \fB$ fetch android\fR # Chromium checkout for Android platform 292 \fB$ fetch android\fR # Chromium checkout for Android platform
294 \fB$ fetch ios\fR # Chromium checkout for iOS platform 293 \fB$ fetch ios\fR # Chromium checkout for iOS platform
295 .fi 294 .fi
296 .if n \{\ 295 .if n \{\
297 .RE 296 .RE
298 .\} 297 .\}
299 .sp 298 .sp
300 .sp 299 .sp
301 When the fetch tool completes you should have the following in your working dire ctory: 300 When the fetch tool completes you should have the following in your working dire ctory:
302 .sp 301 .sp
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 \fB$ git new\-branch fix_typo\fR 566 \fB$ git new\-branch fix_typo\fR
568 \fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\ &.txt\fR 567 \fB$ echo \-e \*(Aq/Banana\ens/Banana/Kuun\enwq\*(Aq | ed build/whitespace_file\ &.txt\fR
569 1503 568 1503
570 It was a Domo\-Banana\&. 569 It was a Domo\-Banana\&.
571 It was a Domo\-Kuun\&. 570 It was a Domo\-Kuun\&.
572 1501 571 1501
573 \fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR 572 \fB$ git commit \-am \*(AqFix terrible typo\&.\*(Aq\fR
574 [fix_typo 615ffa7] Fix terrible typo\&. 573 [fix_typo 615ffa7] Fix terrible typo\&.
575 1 file changed, 1 insertion(+), 1 deletion(\-) 574 1 file changed, 1 insertion(+), 1 deletion(\-)
576 \fB$ git map\fR 575 \fB$ git map\fR
577 \fB* 615ffa7» \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix terrible typo\&. 576 * \fB615ffa7» \fR (HEAD \-> fix_typo) 2014\-04\-10 ~ Fix terrible typo\&.
578 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(fix_typo)\fR 577 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(fix_typo)\fR
579 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds 578 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
580 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&. 579 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&.
581 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&. 580 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&.
582 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView 581 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView
583 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path 582 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
584 * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stder r 583 * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stder r
585 \fB$ git status\fR 584 \fB$ git status\fR
586 # On branch fix_typo 585 # On branch fix_typo
587 # Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. 586 # Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
669 .sp 668 .sp
670 Since we got lgtm, let the CQ land it\&. 669 Since we got lgtm, let the CQ land it\&.
671 .sp 670 .sp
672 .if n \{\ 671 .if n \{\
673 .RS 4 672 .RS 4
674 .\} 673 .\}
675 .nf 674 .nf
676 \fB$ git cl set_commit\fR 675 \fB$ git cl set_commit\fR
677 \fB$ git map\fR 676 \fB$ git map\fR
678 * \fB0e2e52e \fR (\fBchap2\fR) 2014\-04\-10 ~ FREEZE\&.unindexed 677 * \fB0e2e52e \fR (\fBchap2\fR) 2014\-04\-10 ~ FREEZE\&.unindexed
679 | \fB* 2c0ad9c» \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good! 678 | * \fB2c0ad9c» \fR (HEAD \-> fix_typo) 2014\-04\-10 ~ Fix typo for good!
680 | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&. 679 | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&.
681 |/ 680 |/
682 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(chap2, fix_typo)\fR 681 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(chap2, fix_typo)\fR
683 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds 682 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
684 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&. 683 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&.
685 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&. 684 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&.
686 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView 685 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView
687 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path 686 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
688 * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stder r 687 * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stder r
689 .fi 688 .fi
(...skipping 14 matching lines...) Expand all
704 $ git nav\-upstream\fR 703 $ git nav\-upstream\fR
705 Note: checking out \*(Aqorigin/master\*(Aq\&. 704 Note: checking out \*(Aqorigin/master\*(Aq\&.
706 705
707 You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experiment al 706 You are in \*(Aqdetached HEAD\*(Aq state\&. You can look around, make experiment al
708 changes and commit them, and you can discard any commits you make in this 707 changes and commit them, and you can discard any commits you make in this
709 state without impacting any branches by performing another checkout\&. 708 state without impacting any branches by performing another checkout\&.
710 709
711 If you want to create a new branch to retain commits you create, you may 710 If you want to create a new branch to retain commits you create, you may
712 do so (now or later) by using \-b with the checkout command again\&. Example: 711 do so (now or later) by using \-b with the checkout command again\&. Example:
713 712
714 git checkout \-b new_branch_name 713 git checkout \-b <new\-branch\-name>
715 714
716 HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes 715 HEAD is now at beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
717 \fB$ git nav\-downstream\fR 716 \fB$ git nav\-downstream\fR
718 Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes 717 Previous HEAD position was beec6f4\&.\&.\&. Make ReflectorImpl use mailboxes
719 Switched to branch \*(Aqchap2\*(Aq 718 Switched to branch \*(Aqchap2\*(Aq
720 Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&. 719 Your branch is ahead of \*(Aqorigin/master\*(Aq by 1 commit\&.
721 (use "git push" to publish your local commits) 720 (use "git push" to publish your local commits)
722 Please select a downstream branch 721 Please select a downstream branch
723 0\&. chap2 722 0\&. chap2
724 1\&. fix_typo 723 1\&. fix_typo
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 + 767 +
769 +"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly 768 +"You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
770 +overhead, barely disturbing the thick cigarette smoke\&. No doubt was left abou t 769 +overhead, barely disturbing the thick cigarette smoke\&. No doubt was left abou t
771 +when the fan was last cleaned\&. 770 +when the fan was last cleaned\&.
772 + 771 +
773 +There was an poignant pause\&. 772 +There was an poignant pause\&.
774 \fB$ git commit \-am \*(AqFinish chapter 2\*(Aq\fR 773 \fB$ git commit \-am \*(AqFinish chapter 2\*(Aq\fR
775 [chap2 ceef712] Finish chapter 2 774 [chap2 ceef712] Finish chapter 2
776 1 file changed, 6 insertions(+) 775 1 file changed, 6 insertions(+)
777 \fB$ git map\fR 776 \fB$ git map\fR
778 \fB* ceef712» \fR (\fBchap2\fR) 2014\-04\-10 ~ Finish chapter 2 777 * \fBceef712» \fR (HEAD \-> chap2) 2014\-04\-10 ~ Finish chapter 2
779 | * \fB2c0ad9c \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good! 778 | * \fB2c0ad9c \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good!
780 | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&. 779 | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&.
781 |/ 780 |/
782 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(chap2, fix_typo)\fR 781 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(chap2, fix_typo)\fR
783 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds 782 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
784 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&. 783 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&.
785 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&. 784 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&.
786 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView 785 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView
787 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path 786 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
788 * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stder r 787 * \fB33a7a74 \fR 2014\-04\-10 ~ Always output seccomp error messages to stder r
(...skipping 26 matching lines...) Expand all
815 \fB$ cat >> build/whitespace_file\&.txt <<EOF\fR 814 \fB$ cat >> build/whitespace_file\&.txt <<EOF\fR
816 815
817 CHAPTER 3: 816 CHAPTER 3:
818 Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he 817 Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Kun left he
819 began feeling sick\&. 818 began feeling sick\&.
820 EOF 819 EOF
821 \fB$ git commit \-am \*(Aqbeginning of chapter 3\*(Aq\fR 820 \fB$ git commit \-am \*(Aqbeginning of chapter 3\*(Aq\fR
822 [chap3 7d4238a] beginning of chapter 3 821 [chap3 7d4238a] beginning of chapter 3
823 1 file changed, 4 insertions(+) 822 1 file changed, 4 insertions(+)
824 \fB$ git map\fR 823 \fB$ git map\fR
825 \fB* 7d4238a» \fR (\fBchap3\fR) 2014\-04\-10 ~ beginning of chapter 3 824 * \fB7d4238a» \fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
826 * \fBceef712 \fR (\fBchap2\fR) 2014\-04\-10 ~ Finish chapter 2\fB <(chap3) \fR 825 * \fBceef712 \fR (\fBchap2\fR) 2014\-04\-10 ~ Finish chapter 2\fB <(chap3) \fR
827 | * \fB2c0ad9c \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good! 826 | * \fB2c0ad9c \fR (\fBfix_typo\fR) 2014\-04\-10 ~ Fix typo for good!
828 | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&. 827 | * \fB615ffa7 \fR 2014\-04\-10 ~ Fix terrible typo\&.
829 |/ 828 |/
830 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(chap2, fix_typo)\fR 829 * \fBbeec6f4 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Make ReflectorIm pl use mailboxes\fB <(chap2, fix_typo)\fR
831 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds 830 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
832 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&. 831 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&.
833 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&. 832 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&.
834 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView 833 * \fB073b0c2 \fR 2014\-04\-10 ~ ContentView\->ContentViewCore in ContentViewR enderView
835 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path 834 * \fB2250f53 \fR 2014\-04\-10 ~ ozone: evdev: Filter devices by path
(...skipping 10 matching lines...) Expand all
846 .\} 845 .\}
847 .nf 846 .nf
848 \fB$ git rebase\-update\fR 847 \fB$ git rebase\-update\fR
849 Fetching origin 848 Fetching origin
850 From https://upstream 849 From https://upstream
851 beec6f4\&.\&.59cdb73 master \-> origin/master 850 beec6f4\&.\&.59cdb73 master \-> origin/master
852 Rebasing: chap2 851 Rebasing: chap2
853 Rebasing: fix_typo 852 Rebasing: fix_typo
854 Failed! Attempting to squash fix_typo \&.\&.\&. Success! 853 Failed! Attempting to squash fix_typo \&.\&.\&. Success!
855 Rebasing: chap3 854 Rebasing: chap3
855 Reparented chap3 to track origin/master (was tracking chap2)
856 Deleted branch fix_typo (was 5d26fec)\&. 856 Deleted branch fix_typo (was 5d26fec)\&.
857 Reparented chap3 to track origin/master (was tracking chap2)
858 Deleted branch chap2 (was 5d26fec)\&. 857 Deleted branch chap2 (was 5d26fec)\&.
859 .fi 858 .fi
860 .if n \{\ 859 .if n \{\
861 .RE 860 .RE
862 .\} 861 .\}
863 .sp 862 .sp
864 Well look at that\&. The CQ landed our typo and chapter2 branches already and gi t rebase\-update cleaned them up for us\&. 863 Well look at that\&. The CQ landed our typo and chapter2 branches already and gi t rebase\-update cleaned them up for us\&.
865 .sp 864 .sp
866 .if n \{\ 865 .if n \{\
867 .RS 4 866 .RS 4
868 .\} 867 .\}
869 .nf 868 .nf
870 \fB$ gclient sync\fR 869 \fB$ gclient sync\fR
871 \&.\&.\&. truncated output \&.\&.\&. 870 \&.\&.\&. truncated output \&.\&.\&.
872 \fB$ git map\fR 871 \fB$ git map\fR
873 \fB* 93fe917» \fR (\fBchap3\fR) 2014\-04\-10 ~ beginning of chapter 3 872 * \fB93fe917» \fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
874 * \fB5d26fec \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Finish chapter 2 \fB <(chap3)\fR 873 * \fB5d26fec \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Finish chapter 2 \fB <(chap3)\fR
875 * \fBdf7fefb \fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. 874 * \fBdf7fefb \fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
876 * \fB4b39cda \fR 2014\-04\-10 ~ Fix terrible typo\&. 875 * \fB4b39cda \fR 2014\-04\-10 ~ Fix terrible typo\&.
877 * \fB248c5b6 \fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProce ssObserver::OnSetFieldTrialGroup\&. 876 * \fB248c5b6 \fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProce ssObserver::OnSetFieldTrialGroup\&.
878 * \fB8171df8 \fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypt o accelerator\&. 877 * \fB8171df8 \fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypt o accelerator\&.
879 * \fBd6a30d2 \fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event 878 * \fBd6a30d2 \fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
880 * \fBbeec6f4 \fR 2014\-04\-10 ~ Make ReflectorImpl use mailboxes 879 * \fBbeec6f4 \fR 2014\-04\-10 ~ Make ReflectorImpl use mailboxes
881 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds 880 * \fB41290e0 \fR 2014\-04\-10 ~ don\*(Aqt use glibc\-specific execinfo\&.h on uclibc builds
882 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&. 881 * \fBa76fde7 \fR 2014\-04\-10 ~ [fsp] Add requestUnmount() method together wi th the request manager\&.
883 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&. 882 * \fB9de7a71 \fR 2014\-04\-10 ~ linux_aura: Use system configuration for midd le clicking the titlebar\&.
(...skipping 19 matching lines...) Expand all
903 \&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&. 902 \&.\&.\&. lots of output, it\*(Aqs a conflict alright :(\&.\&.\&.
904 \fB$ git diff\fR 903 \fB$ git diff\fR
905 \fBdiff \-\-cc build/whitespace_file\&.txt\fR 904 \fBdiff \-\-cc build/whitespace_file\&.txt\fR
906 \fBindex 1293282,f903ea2\&.\&.0000000\fR 905 \fBindex 1293282,f903ea2\&.\&.0000000\fR
907 \fB\-\-\- a/build/whitespace_file\&.txt\fR 906 \fB\-\-\- a/build/whitespace_file\&.txt\fR
908 \fB+++ b/build/whitespace_file\&.txt\fR 907 \fB+++ b/build/whitespace_file\&.txt\fR
909 @@@ \-42,4 \-42,5 +42,9 @@@ when the fan was last cleaned 908 @@@ \-42,4 \-42,5 +42,9 @@@ when the fan was last cleaned
910 There was an poignant pause\&. 909 There was an poignant pause\&.
911 910
912 CHAPTER 3: 911 CHAPTER 3:
913 ++<<<<<<< HEAD 912 ++<<<<<<< 59cdb7335b1c3a159ecc22214441cbe2194de25c
914 +Hilariousness! This chapter is awesome! 913 +Hilariousness! This chapter is awesome!
915 ++======= 914 ++=======
916 + Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Ku n left he 915 + Mr\&. Usagi felt that something wasn\*(Aqt right\&. Shortly after the Domo\-Ku n left he
917 + began feeling sick\&. 916 + began feeling sick\&.
918 ++>>>>>>> beginning of chapter 3 917 ++>>>>>>> beginning of chapter 3
919 .fi 918 .fi
920 .if n \{\ 919 .if n \{\
921 .RE 920 .RE
922 .\} 921 .\}
923 .sp 922 .sp
(...skipping 30 matching lines...) Expand all
954 .\} 953 .\}
955 .nf 954 .nf
956 \fB$ git rebase \-\-continue\fR 955 \fB$ git rebase \-\-continue\fR
957 Applying: beginning of chapter 3 956 Applying: beginning of chapter 3
958 \fB$ git rebase\-update\fR 957 \fB$ git rebase\-update\fR
959 Fetching origin 958 Fetching origin
960 chap3 up\-to\-date 959 chap3 up\-to\-date
961 \fB$ gclient sync\fR 960 \fB$ gclient sync\fR
962 \&.\&.\&. truncated output \&.\&.\&. 961 \&.\&.\&. truncated output \&.\&.\&.
963 \fB$ git map\fR 962 \fB$ git map\fR
964 \fB* 1cb4f5b» \fR (\fBchap3\fR) 2014\-04\-10 ~ beginning of chapter 3 963 * \fB1cb4f5b» \fR (HEAD \-> chap3) 2014\-04\-10 ~ beginning of chapter 3
965 * \fB59cdb73 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Refactor data in terchange format\&.\fB <(chap3)\fR 964 * \fB59cdb73 \fR (origin/master, origin/HEAD) 2014\-04\-10 ~ Refactor data in terchange format\&.\fB <(chap3)\fR
966 * \fB34676a3 \fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-pa ge navigations\&. 965 * \fB34676a3 \fR 2014\-04\-10 ~ Ensure FS is exited for all not\-in\-same\-pa ge navigations\&.
967 * \fB7d4784e \fR 2014\-04\-10 ~ Add best chapter2 ever! 966 * \fB7d4784e \fR 2014\-04\-10 ~ Add best chapter2 ever!
968 * \fB5d26fec \fR 2014\-04\-10 ~ Finish chapter 2 967 * \fB5d26fec \fR 2014\-04\-10 ~ Finish chapter 2
969 * \fBdf7fefb \fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&. 968 * \fBdf7fefb \fR 2014\-04\-10 ~ Revert 255617, due to it not tracking use of the link doctor page properly\&.
970 * \fB4b39cda \fR 2014\-04\-10 ~ Fix terrible typo\&. 969 * \fB4b39cda \fR 2014\-04\-10 ~ Fix terrible typo\&.
971 * \fB248c5b6 \fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProce ssObserver::OnSetFieldTrialGroup\&. 970 * \fB248c5b6 \fR 2014\-04\-10 ~ Temporarily CHECK(trial) in ChromeRenderProce ssObserver::OnSetFieldTrialGroup\&.
972 * \fB8171df8 \fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypt o accelerator\&. 971 * \fB8171df8 \fR 2014\-04\-10 ~ Remove AMD family check for the flapper crypt o accelerator\&.
973 * \fBd6a30d2 \fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event 972 * \fBd6a30d2 \fR 2014\-04\-10 ~ Change the Pica load benchmark to listen for the polymer\-ready event
974 * \fBbeec6f4 \fR 2014\-04\-10 ~ Make ReflectorImpl use mailboxes 973 * \fBbeec6f4 \fR 2014\-04\-10 ~ Make ReflectorImpl use mailboxes
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
1047 .IP " 6." 4 1046 .IP " 6." 4
1048 main Chromium waterfall 1047 main Chromium waterfall
1049 .RS 4 1048 .RS 4
1050 \%http://build.chromium.org 1049 \%http://build.chromium.org
1051 .RE 1050 .RE
1052 .IP " 7." 4 1051 .IP " 7." 4
1053 here 1052 here
1054 .RS 4 1053 .RS 4
1055 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git 1054 \%https://chromium.googlesource.com/chromium/tools/depot_tools.git
1056 .RE 1055 .RE
OLDNEW
« no previous file with comments | « man/html/depot_tools_tutorial.html ('k') | man/src/depot_tools_tutorial.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698