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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: man/html/depot_tools_tutorial.html

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 | « no previous file | man/man7/depot_tools_tutorial.7 » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" 1 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"> 3 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4 <head> 4 <head>
5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / > 5 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" / >
6 <meta name="generator" content="AsciiDoc 8.6.9" /> 6 <meta name="generator" content="AsciiDoc 8.6.9" />
7 <title>depot_tools_tutorial(7)</title> 7 <title>depot_tools_tutorial(7)</title>
8 <style type="text/css"> 8 <style type="text/css">
9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */ 9 /* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10 10
(...skipping 884 matching lines...) Expand 10 before | Expand all | Expand 10 after
895 </td> 895 </td>
896 <td class="content"><strong>DO NOT</strong> use drag-n-drop or copy-n-paste extr act from Explorer, this will not 896 <td class="content"><strong>DO NOT</strong> use drag-n-drop or copy-n-paste extr act from Explorer, this will not
897 extract the hidden &#8220;.git&#8221; folder which is necessary for <em>depot_to ols</em> to 897 extract the hidden &#8220;.git&#8221; folder which is necessary for <em>depot_to ols</em> to
898 autoupdate itself. You can use &#8220;Extract all&#8230;&#8221; from the context menu though.</td> 898 autoupdate itself. You can use &#8220;Extract all&#8230;&#8221; from the context menu though.</td>
899 </tr></table> 899 </tr></table>
900 </div> 900 </div>
901 <div class="paragraph"><p>Add <em>depot_tools</em> to the <em>end</em> of your P ATH. Assuming you unzipped the 901 <div class="paragraph"><p>Add <em>depot_tools</em> to the <em>end</em> of your P ATH. Assuming you unzipped the
902 bundle to <code>C:\workspace\depot_tools</code>:</p></div> 902 bundle to <code>C:\workspace\depot_tools</code>:</p></div>
903 <div class="dlist"><dl> 903 <div class="dlist"><dl>
904 <dt class="hdlist1"> 904 <dt class="hdlist1">
905 With Administrator access: 905 With Administrator access:
906 </dt> 906 </dt>
907 <dd> 907 <dd>
908 <p> 908 <p>
909 <strong>Control Panel &#8594; System and Security &#8594; System &#8594; Advan ced system settings</strong> 909 <strong>Control Panel &#8594; System and Security &#8594; System &#8594; Advan ced system settings</strong>
910 </p> 910 </p>
911 <div class="paragraph"><p>Modify the PATH system variable to include <code>C:\wo rkspace\depot_tools</code>.</p></div> 911 <div class="paragraph"><p>Modify the PATH system variable to include <code>C:\wo rkspace\depot_tools</code>.</p></div>
912 </dd> 912 </dd>
913 <dt class="hdlist1"> 913 <dt class="hdlist1">
914 Without Administrator access: 914 Without Administrator access:
915 </dt> 915 </dt>
916 <dd> 916 <dd>
917 <p> 917 <p>
918 <strong>Control Panel &#8594; User Accounts &#8594; User Accounts &#8594; Chan ge my environment variables</strong> 918 <strong>Control Panel &#8594; User Accounts &#8594; User Accounts &#8594; Chan ge my environment variables</strong>
919 </p> 919 </p>
920 <div class="paragraph"><p>Add a PATH user variable: <code>%PATH%;C:\workspace\de pot_tools</code>.</p></div> 920 <div class="paragraph"><p>Add a PATH user variable: <code>%PATH%;C:\workspace\de pot_tools</code>.</p></div>
921 </dd> 921 </dd>
922 </dl></div> 922 </dl></div>
923 <div class="paragraph"><p>From a <code>cmd.exe</code> shell, run the command <co de>gclient</code> (without arguments). On first 923 <div class="paragraph"><p>From a <code>cmd.exe</code> shell, run the command <co de>gclient</code> (without arguments). On first
924 run, gclient will install all the Windows-specific bits needed to work with the 924 run, gclient will install all the Windows-specific bits needed to work with the
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
975 </div> 975 </div>
976 </div> 976 </div>
977 </div> 977 </div>
978 <div class="sect1"> 978 <div class="sect1">
979 <h2 id="_tl_dr">TL;DR</h2> 979 <h2 id="_tl_dr">TL;DR</h2>
980 <div class="sectionbody"> 980 <div class="sectionbody">
981 <div class="listingblock"> 981 <div class="listingblock">
982 <div class="content"> 982 <div class="content">
983 <pre><code><strong><span class="white">$</span></strong> # get the code 983 <pre><code><strong><span class="white">$</span></strong> # get the code
984 <strong><span class="white">$</span></strong> # In an empty directory: 984 <strong><span class="white">$</span></strong> # In an empty directory:
985 <strong><span class="white">$ fetch {chromium,blink,...}</span></strong> 985 <strong><span class="white">$ fetch {chromium,...}</span></strong>
986 986
987 <strong><span class="white">$</span></strong> # Update third_party repos and run pre-compile hooks 987 <strong><span class="white">$</span></strong> # Update third_party repos and run pre-compile hooks
988 <strong><span class="white">$ gclient sync</span></strong> 988 <strong><span class="white">$ gclient sync</span></strong>
989 989
990 <strong><span class="white">$</span></strong> # Make a new change and upload it for review 990 <strong><span class="white">$</span></strong> # Make a new change and upload it for review
991 <strong><span class="white">$ git new-branch &lt;branch_name&gt;</span></strong> 991 <strong><span class="white">$ git new-branch &lt;branch_name&gt;</span></strong>
992 <strong><span class="white">$</span></strong> # repeat: [edit, git add, git comm it] 992 <strong><span class="white">$</span></strong> # repeat: [edit, git add, git comm it]
993 <strong><span class="white">$ git cl upload</span></strong> 993 <strong><span class="white">$ git cl upload</span></strong>
994 994
995 <strong><span class="white">$</span></strong> # After change is reviewed, commit with the CQ 995 <strong><span class="white">$</span></strong> # After change is reviewed, commit with the CQ
996 <strong><span class="white">$ git cl set_commit</span></strong> 996 <strong><span class="white">$ git cl set_commit</span></strong>
997 <strong><span class="white">$</span></strong> # Note that the committed hash whi ch lands will /not/ match the 997 <strong><span class="white">$</span></strong> # Note that the committed hash whi ch lands will /not/ match the
998 <strong><span class="white">$</span></strong> # commit hashes of your local bran ch.</code></pre> 998 <strong><span class="white">$</span></strong> # commit hashes of your local bran ch.</code></pre>
999 </div></div> 999 </div></div>
1000 </div> 1000 </div>
1001 </div> 1001 </div>
1002 <div class="sect1"> 1002 <div class="sect1">
1003 <h2 id="_getting_the_code">GETTING THE CODE</h2> 1003 <h2 id="_getting_the_code">GETTING THE CODE</h2>
1004 <div class="sectionbody"> 1004 <div class="sectionbody">
1005 <div class="paragraph"><p>Pick an empty directory and run one of the following:< /p></div> 1005 <div class="paragraph"><p>Pick an empty directory and run one of the following:< /p></div>
1006 <div class="listingblock"> 1006 <div class="listingblock">
1007 <div class="content"> 1007 <div class="content">
1008 <pre><code><strong><span class="white">$ fetch chromium</span></strong> # Basic checkout for desktop Chromium 1008 <pre><code><strong><span class="white">$ fetch chromium</span></strong> # Basic checkout for desktop Chromium
1009 <strong><span class="white">$ fetch blink</span></strong> # Chromium code wi th Blink checked out to tip-of-tree
1010 <strong><span class="white">$ fetch android</span></strong> # Chromium checkou t for Android platform 1009 <strong><span class="white">$ fetch android</span></strong> # Chromium checkou t for Android platform
1011 <strong><span class="white">$ fetch ios</span></strong> # Chromium checkou t for iOS platform</code></pre> 1010 <strong><span class="white">$ fetch ios</span></strong> # Chromium checkou t for iOS platform</code></pre>
1012 </div></div> 1011 </div></div>
1013 <div class="paragraph"><p>When the <code>fetch</code> tool completes you should have the following in your working 1012 <div class="paragraph"><p>When the <code>fetch</code> tool completes you should have the following in your working
1014 directory:</p></div> 1013 directory:</p></div>
1015 <div class="listingblock"> 1014 <div class="listingblock">
1016 <div class="content"> 1015 <div class="content">
1017 <pre><code><strong><span class="white">.gclient</span></strong> # A configurat ion file for you source checkout 1016 <pre><code><strong><span class="white">.gclient</span></strong> # A configurat ion file for you source checkout
1018 <strong><span class="white">src/</span></strong> # Top-level Chromium sour ce checkout.</code></pre> 1017 <strong><span class="white">src/</span></strong> # Top-level Chromium sour ce checkout.</code></pre>
1019 </div></div> 1018 </div></div>
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1238 </code></pre></div></div><p><div class="paragraph"> Let's fix something!</p></di v><div class="listingblock"><div class="content"><pre><code><span style="font-we ight: bold; color: #ffffff">$ git new-branch fix_typo</span> 1237 </code></pre></div></div><p><div class="paragraph"> Let's fix something!</p></di v><div class="listingblock"><div class="content"><pre><code><span style="font-we ight: bold; color: #ffffff">$ git new-branch fix_typo</span>
1239 <span style="font-weight: bold; color: #ffffff">$ echo -e '/Banana\ns/Banana/Kuu n\nwq' | ed build/whitespace_file.txt</span> 1238 <span style="font-weight: bold; color: #ffffff">$ echo -e '/Banana\ns/Banana/Kuu n\nwq' | ed build/whitespace_file.txt</span>
1240 1503 1239 1503
1241 It was a Domo-Banana. 1240 It was a Domo-Banana.
1242 It was a Domo-Kuun. 1241 It was a Domo-Kuun.
1243 1501 1242 1501
1244 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix terrible t ypo.'</span> 1243 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix terrible t ypo.'</span>
1245 [fix_typo 615ffa7] Fix terrible typo. 1244 [fix_typo 615ffa7] Fix terrible typo.
1246 1 file changed, 1 insertion(+), 1 deletion(-) 1245 1 file changed, 1 insertion(+), 1 deletion(-)
1247 <span style="font-weight: bold; color: #ffffff">$ git map</span> 1246 <span style="font-weight: bold; color: #ffffff">$ git map</span>
1248 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1 6; background-color: #492ee1">615ffa7» </span><span style="color: #19c518"> (</ span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">fix_typo</span><span style="font-weight: bold"></span><span style="font -weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo. 1247 * <span style="font-weight: bold; color: #e42e16">615ffa7» </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; fix_typo</s pan><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-1 0</span> ~ Fix terrible typo.
1249 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(fix_typo)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> 1248 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(fix_typo)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
1250 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds 1249 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds
1251 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager. 1250 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager.
1252 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar. 1251 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar.
1253 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView 1252 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView
1254 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path 1253 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path
1255 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr 1254 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr
1256 <span style="font-weight: bold; color: #ffffff">$ git status</span> 1255 <span style="font-weight: bold; color: #ffffff">$ git status</span>
1257 # On branch fix_typo 1256 # On branch fix_typo
1258 # Your branch is ahead of 'origin/master' by 1 commit. 1257 # Your branch is ahead of 'origin/master' by 1 commit.
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
1307 "What took you so long?", inquired his wife. 1306 "What took you so long?", inquired his wife.
1308 1307
1309 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix typo for g ood!'</span> 1308 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Fix typo for g ood!'</span>
1310 [fix_typo 2c0ad9c] Fix typo for good! 1309 [fix_typo 2c0ad9c] Fix typo for good!
1311 1 file changed, 1 insertion(+), 1 deletion(-) 1310 1 file changed, 1 insertion(+), 1 deletion(-)
1312 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span> 1311 <span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
1313 ... truncated output ... 1312 ... truncated output ...
1314 </code></pre></div></div><p><div class="paragraph"> Since we got lgtm, let the C Q land it.</p></div><div class="listingblock"><div class="content"><pre><code><s pan style="font-weight: bold; color: #ffffff">$ git cl set_commit</span> 1313 </code></pre></div></div><p><div class="paragraph"> Since we got lgtm, let the C Q land it.</p></div><div class="listingblock"><div class="content"><pre><code><s pan style="font-weight: bold; color: #ffffff">$ git cl set_commit</span>
1315 <span style="font-weight: bold; color: #ffffff">$ git map</span> 1314 <span style="font-weight: bold; color: #ffffff">$ git map</span>
1316 * <span style="font-weight: bold; color: #e42e16">0e2e52e </span><span sty le="color: #19c518"> (</span><span style="color: #19c518"></span><span style="fo nt-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></s pan><span style="font-weight: bold"></span><span style="color: #19c518">) </span ><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed 1315 * <span style="font-weight: bold; color: #e42e16">0e2e52e </span><span sty le="color: #19c518"> (</span><span style="color: #19c518"></span><span style="fo nt-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></s pan><span style="font-weight: bold"></span><span style="color: #19c518">) </span ><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
1317 <span style="color: #e42e16">|</span> <span style="background-color: #492ee1"></ span><span style="font-weight: bold; background-color: #492ee1">* </span><span s tyle="font-weight: bold; color: #e42e16; background-color: #492ee1">2c0ad9c» </span><span style="color: #19c518"> (</span><span style="color: #33d6e5"></span ><span style="font-weight: bold; color: #33d6e5">fix_typo</span><span style="fon t-weight: bold"></span><span style="font-weight: bold"></span><span style="color : #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo fo r good! 1316 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">2c0ad9c»</span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; fix_typo</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
1318 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo. 1317 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
1319 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> 1318 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
1320 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(chap2, fix_typo)</span ><span style="font-weight: bold"></span><span style="font-weight: bold"></span> 1319 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(chap2, fix_typo)</span ><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
1321 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds 1320 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds
1322 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager. 1321 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager.
1323 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar. 1322 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar.
1324 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView 1323 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView
1325 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path 1324 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path
1326 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr 1325 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr
1327 </code></pre></div></div><p><div class="paragraph"> Switch back to where we were using the nav* commands (for fun... git checkout would work here too)</p></div> <div class="listingblock"><div class="content"><pre><code><span style="font-weig ht: bold; color: #ffffff">$ git map-branches</span> 1326 </code></pre></div></div><p><div class="paragraph"> Switch back to where we were using the nav* commands (for fun... git checkout would work here too)</p></div> <div class="listingblock"><div class="content"><pre><code><span style="font-weig ht: bold; color: #ffffff">$ git map-branches</span>
1328 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master 1327 <span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
1329 </span><span style="color: #19c518"></span><span style="color: #19c518"> chap2 1328 </span><span style="color: #19c518"></span><span style="color: #19c518"> chap2
1330 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> fix_typo * 1329 </span><span style="color: #33d6e5"></span><span style="font-weight: bold; color : #33d6e5"> fix_typo *
1331 </span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span> 1330 </span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
1332 Note: checking out 'origin/master'. 1331 Note: checking out 'origin/master'.
1333 1332
1334 You are in 'detached HEAD' state. You can look around, make experimental 1333 You are in 'detached HEAD' state. You can look around, make experimental
1335 changes and commit them, and you can discard any commits you make in this 1334 changes and commit them, and you can discard any commits you make in this
1336 state without impacting any branches by performing another checkout. 1335 state without impacting any branches by performing another checkout.
1337 1336
1338 If you want to create a new branch to retain commits you create, you may 1337 If you want to create a new branch to retain commits you create, you may
1339 do so (now or later) by using -b with the checkout command again. Example: 1338 do so (now or later) by using -b with the checkout command again. Example:
1340 1339
1341 git checkout -b new_branch_name 1340 git checkout -b &lt;new-branch-name&gt;
1342 1341
1343 HEAD is now at beec6f4... Make ReflectorImpl use mailboxes 1342 HEAD is now at beec6f4... Make ReflectorImpl use mailboxes
1344 <span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span> 1343 <span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
1345 Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes 1344 Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes
1346 Switched to branch 'chap2' 1345 Switched to branch 'chap2'
1347 Your branch is ahead of 'origin/master' by 1 commit. 1346 Your branch is ahead of 'origin/master' by 1 commit.
1348 (use "git push" to publish your local commits) 1347 (use "git push" to publish your local commits)
1349 Please select a downstream branch 1348 Please select a downstream branch
1350 0. chap2 1349 0. chap2
1351 1. fix_typo 1350 1. fix_typo
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
1384 <span style="color: #19c518">+</span> 1383 <span style="color: #19c518">+</span>
1385 <span style="color: #19c518">+</span><span style="color: #19c518">"You recall wh at happened on Mulholland drive?" The ceiling fan rotated slowly</span> 1384 <span style="color: #19c518">+</span><span style="color: #19c518">"You recall wh at happened on Mulholland drive?" The ceiling fan rotated slowly</span>
1386 <span style="color: #19c518">+</span><span style="color: #19c518">overhead, bare ly disturbing the thick cigarette smoke. No doubt was left about</span> 1385 <span style="color: #19c518">+</span><span style="color: #19c518">overhead, bare ly disturbing the thick cigarette smoke. No doubt was left about</span>
1387 <span style="color: #19c518">+</span><span style="color: #19c518">when the fan w as last cleaned.</span> 1386 <span style="color: #19c518">+</span><span style="color: #19c518">when the fan w as last cleaned.</span>
1388 <span style="color: #19c518">+</span> 1387 <span style="color: #19c518">+</span>
1389 <span style="color: #19c518">+</span><span style="color: #19c518">There was an p oignant pause.</span> 1388 <span style="color: #19c518">+</span><span style="color: #19c518">There was an p oignant pause.</span>
1390 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Finish chapter 2'</span> 1389 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'Finish chapter 2'</span>
1391 [chap2 ceef712] Finish chapter 2 1390 [chap2 ceef712] Finish chapter 2
1392 1 file changed, 6 insertions(+) 1391 1 file changed, 6 insertions(+)
1393 <span style="font-weight: bold; color: #ffffff">$ git map</span> 1392 <span style="font-weight: bold; color: #ffffff">$ git map</span>
1394 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1 6; background-color: #492ee1">ceef712» </span><span style="color: #19c518"> (</ span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">chap2</span><span style="font-weight: bold"></span><span style="font-we ight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7 e71c">2014-04-10</span> ~ Finish chapter 2 1393 * <span style="font-weight: bold; color: #e42e16">ceef712» </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; chap2</span ><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</ span> ~ Finish chapter 2
1395 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span> <span style="font-weight: bold"></span><span style="font-weight: bold"></span><s pan style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</spa n> ~ Fix typo for good! 1394 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span> <span style="font-weight: bold"></span><span style="font-weight: bold"></span><s pan style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</spa n> ~ Fix typo for good!
1396 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo. 1395 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
1397 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> 1396 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
1398 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(chap2, fix_typo)</span ><span style="font-weight: bold"></span><span style="font-weight: bold"></span> 1397 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(chap2, fix_typo)</span ><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
1399 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds 1398 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds
1400 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager. 1399 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager.
1401 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar. 1400 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar.
1402 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView 1401 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView
1403 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path 1402 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path
1404 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr 1403 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr
1405 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium .org --send-mail</span> 1404 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium .org --send-mail</span>
1406 ... truncated output ... 1405 ... truncated output ...
1407 </code></pre></div></div><p><div class="paragraph"> We poke a committer until th ey lgtm :)</p></div><div class="listingblock"><div class="content"><pre><code><s pan style="font-weight: bold; color: #ffffff">$ git cl set_commit</span> 1406 </code></pre></div></div><p><div class="paragraph"> We poke a committer until th ey lgtm :)</p></div><div class="listingblock"><div class="content"><pre><code><s pan style="font-weight: bold; color: #ffffff">$ git cl set_commit</span>
1408 </code></pre></div></div><p><div class="paragraph"> While that runs through the CQ, let's get started on chapter 3. Since we know that chapter 3 depends on chap ter 2, we'll track the current chapter2 branch.</p></div><div class="listingbloc k"><div class="content"><pre><code><span style="font-weight: bold; color: #fffff f">$ git new-branch --upstream_current chap3</span> 1407 </code></pre></div></div><p><div class="paragraph"> While that runs through the CQ, let's get started on chapter 3. Since we know that chapter 3 depends on chap ter 2, we'll track the current chapter2 branch.</p></div><div class="listingbloc k"><div class="content"><pre><code><span style="font-weight: bold; color: #fffff f">$ git new-branch --upstream_current chap3</span>
1409 <span style="font-weight: bold; color: #ffffff">$ cat &gt;&gt; build/whitespace_ file.txt &lt;&lt;EOF</span> 1408 <span style="font-weight: bold; color: #ffffff">$ cat &gt;&gt; build/whitespace_ file.txt &lt;&lt;EOF</span>
1410 1409
1411 CHAPTER 3: 1410 CHAPTER 3:
1412 Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he 1411 Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he
1413 began feeling sick. 1412 began feeling sick.
1414 EOF 1413 EOF
1415 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'beginning of c hapter 3'</span> 1414 <span style="font-weight: bold; color: #ffffff">$ git commit -am 'beginning of c hapter 3'</span>
1416 [chap3 7d4238a] beginning of chapter 3 1415 [chap3 7d4238a] beginning of chapter 3
1417 1 file changed, 4 insertions(+) 1416 1 file changed, 4 insertions(+)
1418 <span style="font-weight: bold; color: #ffffff">$ git map</span> 1417 <span style="font-weight: bold; color: #ffffff">$ git map</span>
1419 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1 6; background-color: #492ee1">7d4238a» </span><span style="color: #19c518"> (</ span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">chap3</span><span style="font-weight: bold"></span><span style="font-we ight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7 e71c">2014-04-10</span> ~ beginning of chapter 3 1418 * <span style="font-weight: bold; color: #e42e16">7d4238a» </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; chap3</span ><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</ span> ~ beginning of chapter 3
1420 * <span style="font-weight: bold; color: #e42e16">ceef712 </span><span sty le="color: #19c518"> (</span><span style="color: #19c518"></span><span style="fo nt-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></s pan><span style="font-weight: bold"></span><span style="color: #19c518">) </span ><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2<span style="f ont-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt ;(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> 1419 * <span style="font-weight: bold; color: #e42e16">ceef712 </span><span sty le="color: #19c518"> (</span><span style="color: #19c518"></span><span style="fo nt-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></s pan><span style="font-weight: bold"></span><span style="color: #19c518">) </span ><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2<span style="f ont-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> &lt ;(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
1421 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span> <span style="font-weight: bold"></span><span style="font-weight: bold"></span><s pan style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</spa n> ~ Fix typo for good! 1420 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span> <span style="font-weight: bold"></span><span style="font-weight: bold"></span><s pan style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</spa n> ~ Fix typo for good!
1422 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo. 1421 <span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: # e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
1423 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> 1422 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
1424 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(chap2, fix_typo)</span ><span style="font-weight: bold"></span><span style="font-weight: bold"></span> 1423 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span ><span style="font-weight: bold; color: #ffffff"> &lt;(chap2, fix_typo)</span ><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
1425 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds 1424 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds
1426 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager. 1425 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager.
1427 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar. 1426 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar.
1428 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView 1427 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView
1429 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path 1428 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path
1430 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr 1429 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr
1431 </code></pre></div></div><p><div class="paragraph"> We haven't updated the code in a while, so let's do that now.</p></div><div class="listingblock"><div class= "content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebas e-update</span> 1430 </code></pre></div></div><p><div class="paragraph"> We haven't updated the code in a while, so let's do that now.</p></div><div class="listingblock"><div class= "content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git rebas e-update</span>
1432 Fetching origin 1431 Fetching origin
1433 From https://upstream 1432 From https://upstream
1434 beec6f4..59cdb73 master -&gt; origin/master 1433 beec6f4..59cdb73 master -&gt; origin/master
1435 Rebasing: chap2 1434 Rebasing: chap2
1436 Rebasing: fix_typo 1435 Rebasing: fix_typo
1437 Failed! Attempting to squash fix_typo ... Success! 1436 Failed! Attempting to squash fix_typo ... Success!
1438 Rebasing: chap3 1437 Rebasing: chap3
1438 Reparented chap3 to track origin/master (was tracking chap2)
1439 Deleted branch fix_typo (was 5d26fec). 1439 Deleted branch fix_typo (was 5d26fec).
1440 Reparented chap3 to track origin/master (was tracking chap2)
1441 Deleted branch chap2 (was 5d26fec). 1440 Deleted branch chap2 (was 5d26fec).
1442 </code></pre></div></div><p><div class="paragraph"> Well look at that. The CQ la nded our typo and chapter2 branches already and git rebase-update cleaned them up for us.</p></div><div class="listingblock"><div class="content"><pre><code><s pan style="font-weight: bold; color: #ffffff">$ gclient sync</span> 1441 </code></pre></div></div><p><div class="paragraph"> Well look at that. The CQ la nded our typo and chapter2 branches already and git rebase-update cleaned them up for us.</p></div><div class="listingblock"><div class="content"><pre><code><s pan style="font-weight: bold; color: #ffffff">$ gclient sync</span>
1443 ... truncated output ... 1442 ... truncated output ...
1444 <span style="font-weight: bold; color: #ffffff">$ git map</span> 1443 <span style="font-weight: bold; color: #ffffff">$ git map</span>
1445 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1 6; background-color: #492ee1">93fe917» </span><span style="color: #19c518"> (</ span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">chap3</span><span style="font-weight: bold"></span><span style="font-we ight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7 e71c">2014-04-10</span> ~ beginning of chapter 3 1444 * <span style="font-weight: bold; color: #e42e16">93fe917» </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; chap3</span ><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</ span> ~ beginning of chapter 3
1446 * <span style="font-weight: bold; color: #e42e16">5d26fec </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Finish chapter 2<span style="font-weight: bold"></span><span style="fo nt-weight: bold; color: #ffffff"> &lt;(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span> 1445 * <span style="font-weight: bold; color: #e42e16">5d26fec </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Finish chapter 2<span style="font-weight: bold"></span><span style="fo nt-weight: bold; color: #ffffff"> &lt;(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
1447 * <span style="font-weight: bold; color: #e42e16">df7fefb </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Rev ert 255617, due to it not tracking use of the link doctor page properly. 1446 * <span style="font-weight: bold; color: #e42e16">df7fefb </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Rev ert 255617, due to it not tracking use of the link doctor page properly.
1448 * <span style="font-weight: bold; color: #e42e16">4b39cda </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo. 1447 * <span style="font-weight: bold; color: #e42e16">4b39cda </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
1449 * <span style="font-weight: bold; color: #e42e16">248c5b6 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Tem porarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup. 1448 * <span style="font-weight: bold; color: #e42e16">248c5b6 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Tem porarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
1450 * <span style="font-weight: bold; color: #e42e16">8171df8 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Rem ove AMD family check for the flapper crypto accelerator. 1449 * <span style="font-weight: bold; color: #e42e16">8171df8 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Rem ove AMD family check for the flapper crypto accelerator.
1451 * <span style="font-weight: bold; color: #e42e16">d6a30d2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Cha nge the Pica load benchmark to listen for the polymer-ready event 1450 * <span style="font-weight: bold; color: #e42e16">d6a30d2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Cha nge the Pica load benchmark to listen for the polymer-ready event
1452 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Mak e ReflectorImpl use mailboxes 1451 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Mak e ReflectorImpl use mailboxes
1453 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds 1452 * <span style="font-weight: bold; color: #e42e16">41290e0 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don 't use glibc-specific execinfo.h on uclibc builds
1454 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager. 1453 * <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fs p] Add requestUnmount() method together with the request manager.
1455 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar. 1454 * <span style="font-weight: bold; color: #e42e16">9de7a71 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ lin ux_aura: Use system configuration for middle clicking the titlebar.
1456 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView 1455 * <span style="font-weight: bold; color: #e42e16">073b0c2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Con tentView-&gt;ContentViewCore in ContentViewRenderView
1457 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path 1456 * <span style="font-weight: bold; color: #e42e16">2250f53 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozo ne: evdev: Filter devices by path
1458 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr 1457 * <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Alw ays output seccomp error messages to stderr
1459 </code></pre></div></div><p><div class="paragraph"> Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before c ontinuing. Brace for a code conflict!</p></div><div class="listingblock"><div cl ass="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git r ebase-update</span> 1458 </code></pre></div></div><p><div class="paragraph"> Someone on IRC mentions that they actually landed a chapter 3 already! We should pull their changes before c ontinuing. Brace for a code conflict!</p></div><div class="listingblock"><div cl ass="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git r ebase-update</span>
1460 Fetching origin 1459 Fetching origin
1461 From https://upstream 1460 From https://upstream
1462 5d26fec..59cdb73 master -&gt; origin/master 1461 5d26fec..59cdb73 master -&gt; origin/master
1463 Rebasing: chap2 1462 Rebasing: chap2
1464 ... lots of output, it's a conflict alright :(... 1463 ... lots of output, it's a conflict alright :(...
1465 <span style="font-weight: bold; color: #ffffff">$ git diff</span> 1464 <span style="font-weight: bold; color: #ffffff">$ git diff</span>
1466 <span style="font-weight: bold">diff --cc build/whitespace_file.txt</span> 1465 <span style="font-weight: bold">diff --cc build/whitespace_file.txt</span>
1467 <span style="font-weight: bold">index 1293282,f903ea2..0000000</span> 1466 <span style="font-weight: bold">index 1293282,f903ea2..0000000</span>
1468 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> 1467 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span>
1469 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> 1468 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span>
1470 <span style="color: #33d6e5">@@@ -42,4 -42,5 +42,9 @@@</span> when the fan was l ast cleaned 1469 <span style="color: #33d6e5">@@@ -42,4 -42,5 +42,9 @@@</span> when the fan was l ast cleaned
1471 There was an poignant pause. 1470 There was an poignant pause.
1472 1471
1473 CHAPTER 3: 1472 CHAPTER 3:
1474 <span style="color: #19c518">++&lt;&lt;&lt;&lt;&lt;&lt;&lt; HEAD</span> 1473 <span style="color: #19c518">++&lt;&lt;&lt;&lt;&lt;&lt;&lt; 59cdb7335b1c3a159ecc 22214441cbe2194de25c</span>
1475 <span style="color: #19c518"> +Hilariousness! This chapter is awesome!</span> 1474 <span style="color: #19c518"> +Hilariousness! This chapter is awesome!</span>
1476 <span style="color: #19c518">++=======</span> 1475 <span style="color: #19c518">++=======</span>
1477 <span style="color: #19c518">+ Mr. Usagi felt that something wasn't right. Short ly after the Domo-Kun left he</span> 1476 <span style="color: #19c518">+ Mr. Usagi felt that something wasn't right. Short ly after the Domo-Kun left he</span>
1478 <span style="color: #19c518">+ began feeling sick.</span> 1477 <span style="color: #19c518">+ began feeling sick.</span>
1479 <span style="color: #19c518">++&gt;&gt;&gt;&gt;&gt;&gt;&gt; beginning of chapter 3</span> 1478 <span style="color: #19c518">++&gt;&gt;&gt;&gt;&gt;&gt;&gt; beginning of chapter 3</span>
1480 </code></pre></div></div><p><div class="paragraph"> Oh, well, that's not too bad . In fact... that's a terrible chapter 3!</p></div><div class="listingblock"><di v class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ $ EDITOR build/whitespace_file.txt</span> 1479 </code></pre></div></div><p><div class="paragraph"> Oh, well, that's not too bad . In fact... that's a terrible chapter 3!</p></div><div class="listingblock"><di v class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ $ EDITOR build/whitespace_file.txt</span>
1481 ... /me deletes bad chapter 3 ... 1480 ... /me deletes bad chapter 3 ...
1482 <span style="font-weight: bold; color: #ffffff">$ git add build/whitespace_file. txt</span> 1481 <span style="font-weight: bold; color: #ffffff">$ git add build/whitespace_file. txt</span>
1483 <span style="font-weight: bold; color: #ffffff">$ git diff --cached</span> 1482 <span style="font-weight: bold; color: #ffffff">$ git diff --cached</span>
1484 <span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/w hitespace_file.txt</span> 1483 <span style="font-weight: bold">diff --git a/build/whitespace_file.txt b/build/w hitespace_file.txt</span>
1485 <span style="font-weight: bold">index 1293282..f903ea2 100644</span> 1484 <span style="font-weight: bold">index 1293282..f903ea2 100644</span>
1486 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> 1485 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span>
1487 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> 1486 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span>
1488 <span style="color: #33d6e5">@@ -42,4 +42,5 @@</span> when the fan was last clea ned. 1487 <span style="color: #33d6e5">@@ -42,4 +42,5 @@</span> when the fan was last clea ned.
1489 There was an poignant pause. 1488 There was an poignant pause.
1490 1489
1491 CHAPTER 3: 1490 CHAPTER 3:
1492 <span style="color: #e42e16">-Hilariousness! This chapter is awesome!</span> 1491 <span style="color: #e42e16">-Hilariousness! This chapter is awesome!</span>
1493 <span style="color: #19c518">+</span><span style="color: #19c518">Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span> 1492 <span style="color: #19c518">+</span><span style="color: #19c518">Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
1494 <span style="color: #19c518">+</span><span style="color: #19c518">began feeling sick.</span> 1493 <span style="color: #19c518">+</span><span style="color: #19c518">began feeling sick.</span>
1495 </code></pre></div></div><p><div class="paragraph"> Much better</p></div><div cl ass="listingblock"><div class="content"><pre><code><span style="font-weight: bol d; color: #ffffff">$ git rebase --continue</span> 1494 </code></pre></div></div><p><div class="paragraph"> Much better</p></div><div cl ass="listingblock"><div class="content"><pre><code><span style="font-weight: bol d; color: #ffffff">$ git rebase --continue</span>
1496 Applying: beginning of chapter 3 1495 Applying: beginning of chapter 3
1497 <span style="font-weight: bold; color: #ffffff">$ git rebase-update</span> 1496 <span style="font-weight: bold; color: #ffffff">$ git rebase-update</span>
1498 Fetching origin 1497 Fetching origin
1499 chap3 up-to-date 1498 chap3 up-to-date
1500 <span style="font-weight: bold; color: #ffffff">$ gclient sync</span> 1499 <span style="font-weight: bold; color: #ffffff">$ gclient sync</span>
1501 ... truncated output ... 1500 ... truncated output ...
1502 <span style="font-weight: bold; color: #ffffff">$ git map</span> 1501 <span style="font-weight: bold; color: #ffffff">$ git map</span>
1503 <span style="background-color: #492ee1"></span><span style="font-weight: bold; b ackground-color: #492ee1">* </span><span style="font-weight: bold; color: #e42e1 6; background-color: #492ee1">1cb4f5b» </span><span style="color: #19c518"> (</ span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5">chap3</span><span style="font-weight: bold"></span><span style="font-we ight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7 e71c">2014-04-10</span> ~ beginning of chapter 3 1502 * <span style="font-weight: bold; color: #e42e16">1cb4f5b» </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">HEAD -&gt; chap3</span ><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</ span> ~ beginning of chapter 3
1504 * <span style="font-weight: bold; color: #e42e16">59cdb73 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Refactor data interchange format.<span style="font-weight: bold"></spa n><span style="font-weight: bold; color: #ffffff"> &lt;(chap3)</span><span st yle="font-weight: bold"></span><span style="font-weight: bold"></span> 1503 * <span style="font-weight: bold; color: #e42e16">59cdb73 </span><span sty le="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><s pan style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</sp an><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10 </span> ~ Refactor data interchange format.<span style="font-weight: bold"></spa n><span style="font-weight: bold; color: #ffffff"> &lt;(chap3)</span><span st yle="font-weight: bold"></span><span style="font-weight: bold"></span>
1505 * <span style="font-weight: bold; color: #e42e16">34676a3 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Ens ure FS is exited for all not-in-same-page navigations. 1504 * <span style="font-weight: bold; color: #e42e16">34676a3 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Ens ure FS is exited for all not-in-same-page navigations.
1506 * <span style="font-weight: bold; color: #e42e16">7d4784e </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add best chapter2 ever! 1505 * <span style="font-weight: bold; color: #e42e16">7d4784e </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add best chapter2 ever!
1507 * <span style="font-weight: bold; color: #e42e16">5d26fec </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fin ish chapter 2 1506 * <span style="font-weight: bold; color: #e42e16">5d26fec </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fin ish chapter 2
1508 * <span style="font-weight: bold; color: #e42e16">df7fefb </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Rev ert 255617, due to it not tracking use of the link doctor page properly. 1507 * <span style="font-weight: bold; color: #e42e16">df7fefb </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Rev ert 255617, due to it not tracking use of the link doctor page properly.
1509 * <span style="font-weight: bold; color: #e42e16">4b39cda </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo. 1508 * <span style="font-weight: bold; color: #e42e16">4b39cda </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
1510 * <span style="font-weight: bold; color: #e42e16">248c5b6 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Tem porarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup. 1509 * <span style="font-weight: bold; color: #e42e16">248c5b6 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Tem porarily CHECK(trial) in ChromeRenderProcessObserver::OnSetFieldTrialGroup.
1511 * <span style="font-weight: bold; color: #e42e16">8171df8 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Rem ove AMD family check for the flapper crypto accelerator. 1510 * <span style="font-weight: bold; color: #e42e16">8171df8 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Rem ove AMD family check for the flapper crypto accelerator.
1512 * <span style="font-weight: bold; color: #e42e16">d6a30d2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Cha nge the Pica load benchmark to listen for the polymer-ready event 1511 * <span style="font-weight: bold; color: #e42e16">d6a30d2 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Cha nge the Pica load benchmark to listen for the polymer-ready event
1513 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Mak e ReflectorImpl use mailboxes 1512 * <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span sty le="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Mak e ReflectorImpl use mailboxes
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
1574 <div class="sectionbody"> 1573 <div class="sectionbody">
1575 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to 1574 <div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_ tools(7)</a> suite. These tools are meant to
1576 assist with the development of chromium and related projects. Download the tools 1575 assist with the development of chromium and related projects. Download the tools
1577 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div> 1576 from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git"> here</a>.</p></div>
1578 </div> 1577 </div>
1579 </div> 1578 </div>
1580 </div> 1579 </div>
1581 <div id="footnotes"><hr /></div> 1580 <div id="footnotes"><hr /></div>
1582 <div id="footer"> 1581 <div id="footer">
1583 <div id="footer-text"> 1582 <div id="footer-text">
1584 Last updated 2016-04-01 14:13:51 PST 1583 Last updated 2016-07-20 13:07:26 EDT
1585 </div> 1584 </div>
1586 </div> 1585 </div>
1587 </body> 1586 </body>
1588 </html> 1587 </html>
OLDNEW
« no previous file with comments | « no previous file | man/man7/depot_tools_tutorial.7 » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698