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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 234733003: Improvements and bugfixes to the depot_tools doc generation process. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | docs/html/git-freeze.html » ('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 1029 matching lines...) Expand 10 before | Expand all | Expand 10 after
1040 <span style="font-weight: bold; color: #ffffff">$ git map</span> 1040 <span style="font-weight: bold; color: #ffffff">$ git map</span>
1041 <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. 1041 <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.
1042 * <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> 1042 * <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>
1043 * <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 1043 * <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
1044 * <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. 1044 * <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.
1045 * <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. 1045 * <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.
1046 * <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 1046 * <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
1047 * <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 1047 * <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
1048 * <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 1048 * <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
1049 <span style="font-weight: bold; color: #ffffff">$ git status</span> 1049 <span style="font-weight: bold; color: #ffffff">$ git status</span>
1050 On branch fix_typo 1050 # On branch fix_typo
1051 Your branch is ahead of 'origin/master' by 1 commit. 1051 # Your branch is ahead of 'origin/master' by 1 commit.
1052 (use "git push" to publish your local commits) 1052 # (use "git push" to publish your local commits)
1053 1053 #
1054 nothing to commit, working directory clean 1054 nothing to commit, working directory clean
1055 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium .org --send-mail</span> 1055 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium .org --send-mail</span>
1056 ... truncated output ... 1056 ... truncated output ...
1057 </code></pre></div></div><p><div class="paragraph"> While we wait for feedback, let's do something else.</p></div><div class="listingblock"><div class="content" ><pre><code><span style="font-weight: bold; color: #ffffff">$ git new-branch cha p2</span> 1057 </code></pre></div></div><p><div class="paragraph"> While we wait for feedback, let's do something else.</p></div><div class="listingblock"><div class="content" ><pre><code><span style="font-weight: bold; color: #ffffff">$ git new-branch cha p2</span>
1058 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span> 1058 <span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
1059 <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e 16">origin/master 1059 <span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e 16">origin/master
1060 </span><span style="font-weight: bold; color: #33d6e5"></span><span style="font- weight: bold; color: #33d6e5"> chap2 * 1060 </span><span style="font-weight: bold; color: #33d6e5"></span><span style="font- weight: bold; color: #33d6e5"> chap2 *
1061 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> fix_typo 1061 </span><span style="font-weight: bold; color: #19c518"></span><span style="color : #19c518"> fix_typo
1062 </span><span style="font-weight: bold; color: #ffffff">$ cat &gt;&gt; build/whit espace_file.txt &lt;&lt;EOF</span> 1062 </span><span style="font-weight: bold; color: #ffffff">$ cat &gt;&gt; build/whit espace_file.txt &lt;&lt;EOF</span>
1063 1063
1064 "You recall what happened on Mulholland drive?" The ceiling fan rotated slowly 1064 "You recall what happened on Mulholland drive?" The ceiling fan rotated slowly
1065 overhead, barely disturbing the thick cigarette smoke. No doubt was left about 1065 overhead, barely disturbing the thick cigarette smoke. No doubt was left about
1066 when the fan was last cleaned. 1066 when the fan was last cleaned.
1067 EOF 1067 EOF
1068 <span style="font-weight: bold; color: #ffffff">$ git status</span> 1068 <span style="font-weight: bold; color: #ffffff">$ git status</span>
1069 On branch chap2 1069 # On branch chap2
1070 Your branch is up-to-date with 'origin/master'. 1070 # Your branch is up-to-date with 'origin/master'.
1071 1071 #
1072 Changes not staged for commit: 1072 # Changes not staged for commit:
1073 (use "git add &lt;file&gt;..." to update what will be committed) 1073 # (use "git add &lt;file&gt;..." to update what will be committed)
1074 (use "git checkout -- &lt;file&gt;..." to discard changes in working directory ) 1074 # (use "git checkout -- &lt;file&gt;..." to discard changes in working directo ry)
1075 1075 #
1076 » <span style="color: #e42e16">modified: build/whitespace_file.txt</span > 1076 #» <span style="color: #e42e16">modified: build/whitespace_file.txt</span >
1077 1077 #
1078 no changes added to commit (use "git add" and/or "git commit -a") 1078 no changes added to commit (use "git add" and/or "git commit -a")
1079 </code></pre></div></div><p><div class="paragraph"> Someone on the code review p ointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: b old; color: #ffffff">$ git freeze</span> 1079 </code></pre></div></div><p><div class="paragraph"> Someone on the code review p ointed out that our typo-fix has a typo :( We're still working on 'chap2' but we really want to land 'fix_typo', so let's switch over and fix it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: b old; color: #ffffff">$ git freeze</span>
1080 <span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span> 1080 <span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span>
1081 Switched to branch 'fix_typo' 1081 Switched to branch 'fix_typo'
1082 Your branch is ahead of 'origin/master' by 1 commit. 1082 Your branch is ahead of 'origin/master' by 1 commit.
1083 (use "git push" to publish your local commits) 1083 (use "git push" to publish your local commits)
1084 <span style="font-weight: bold; color: #ffffff">$ echo -e '/Kuun\ns/Kuun/Kun\nwq ' | ed build/whitespace_file.txt</span> 1084 <span style="font-weight: bold; color: #ffffff">$ echo -e '/Kuun\ns/Kuun/Kun\nwq ' | ed build/whitespace_file.txt</span>
1085 1501 1085 1501
1086 It was a Domo-Kuun. 1086 It was a Domo-Kuun.
1087 It was a Domo-Kun. 1087 It was a Domo-Kun.
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1216 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span> 1216 <span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
1217 * <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> 1217 * <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>
1218 * <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 1218 * <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
1219 * <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. 1219 * <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.
1220 * <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. 1220 * <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.
1221 * <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 1221 * <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
1222 * <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 1222 * <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
1223 * <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 1223 * <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
1224 </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> 1224 </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>
1225 Fetching origin 1225 Fetching origin
1226 From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo 1226 From https://upstream
1227 beec6f4..59cdb73 master -&gt; origin/master 1227 beec6f4..59cdb73 master -&gt; origin/master
1228 Rebasing: chap2 1228 Rebasing: chap2
1229 Rebasing: fix_typo 1229 Rebasing: fix_typo
1230 Failed! Attempting to squash fix_typo ... Success! 1230 Failed! Attempting to squash fix_typo ... Success!
1231 Rebasing: chap3 1231 Rebasing: chap3
1232 Deleted branch fix_typo (was 5d26fec). 1232 Deleted branch fix_typo (was 5d26fec).
1233 Reparented chap3 to track origin/master (was tracking chap2) 1233 Reparented chap3 to track origin/master (was tracking chap2)
1234 Deleted branch chap2 (was 5d26fec). 1234 Deleted branch chap2 (was 5d26fec).
1235 </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> 1235 </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>
1236 ... truncated output ... 1236 ... truncated output ...
1237 <span style="font-weight: bold; color: #ffffff">$ git map</span> 1237 <span style="font-weight: bold; color: #ffffff">$ git map</span>
1238 <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 1238 <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
1239 * <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> 1239 * <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>
1240 * <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. 1240 * <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.
1241 * <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. 1241 * <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.
1242 * <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. 1242 * <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.
1243 * <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. 1243 * <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.
1244 * <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 1244 * <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
1245 * <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 1245 * <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
1246 * <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 1246 * <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
1247 * <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. 1247 * <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.
1248 * <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. 1248 * <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.
1249 * <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 1249 * <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
1250 * <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 1250 * <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
1251 * <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 1251 * <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
1252 </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> 1252 </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>
1253 Fetching origin 1253 Fetching origin
1254 From /Users/iannucci/chromium/depot_tools/docs/src/demo_repo 1254 From https://upstream
1255 5d26fec..59cdb73 master -&gt; origin/master 1255 5d26fec..59cdb73 master -&gt; origin/master
1256 Rebasing: chap2 1256 Rebasing: chap2
1257 ... lots of output, it's a conflict alright :(... 1257 ... lots of output, it's a conflict alright :(...
1258 <span style="font-weight: bold; color: #ffffff">$ git diff</span> 1258 <span style="font-weight: bold; color: #ffffff">$ git diff</span>
1259 <span style="font-weight: bold">diff --cc build/whitespace_file.txt</span> 1259 <span style="font-weight: bold">diff --cc build/whitespace_file.txt</span>
1260 <span style="font-weight: bold">index 1293282,f903ea2..0000000</span> 1260 <span style="font-weight: bold">index 1293282,f903ea2..0000000</span>
1261 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span> 1261 <span style="font-weight: bold">--- a/build/whitespace_file.txt</span>
1262 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span> 1262 <span style="font-weight: bold">+++ b/build/whitespace_file.txt</span>
1263 <span style="color: #33d6e5">@@@ -42,4 -42,5 +42,9 @@@</span> when the fan was l ast cleaned 1263 <span style="color: #33d6e5">@@@ -42,4 -42,5 +42,9 @@@</span> when the fan was l ast cleaned
1264 There was an poignant pause. 1264 There was an poignant pause.
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
1562 </div> 1562 </div>
1563 </div> 1563 </div>
1564 <div id="footnotes"><hr /></div> 1564 <div id="footnotes"><hr /></div>
1565 <div id="footer"> 1565 <div id="footer">
1566 <div id="footer-text"> 1566 <div id="footer-text">
1567 Last updated 2014-04-10 21:30:33 PDT 1567 Last updated 2014-04-10 21:30:33 PDT
1568 </div> 1568 </div>
1569 </div> 1569 </div>
1570 </body> 1570 </body>
1571 </html> 1571 </html>
OLDNEW
« no previous file with comments | « no previous file | docs/html/git-freeze.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698