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

Unified Diff: docs/src/depot_tools_tutorial.demo.tldr.sh

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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « docs/src/common_demo_functions.sh ('k') | docs/src/filter_demo_output.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: docs/src/depot_tools_tutorial.demo.tldr.sh
diff --git a/docs/src/depot_tools_tutorial.demo.tldr.sh b/docs/src/depot_tools_tutorial.demo.tldr.sh
index 27ff22ef40fdfa74bf32f54898c440e72fb267cb..a7efa819812ce389e494051d70563eb0b1c942fe 100755
--- a/docs/src/depot_tools_tutorial.demo.tldr.sh
+++ b/docs/src/depot_tools_tutorial.demo.tldr.sh
@@ -23,7 +23,7 @@ ed_ws() {
echo -ne "\x1B[37;1m$ echo -e "
echo -n "'$1'"
echo -e " | ed $WS\x1B[m"
- echo -e "$1" | ed $WS
+ echo -e "$1" | ed $WS 2>&1
}
# needs an extra echo afterwards
@@ -117,7 +117,7 @@ map
comment "We haven't updated the code in a while, so let's do that now."
pcommand git rebase-update
echo Fetching origin
-git fetch origin 2>&1 | grep -v 'stage'
+git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+'
silent git update-ref refs/remotes/origin/master stage_2
silent git tag -d $(git tag -l 'stage_*')
git rebase-update --no_fetch
@@ -132,7 +132,7 @@ comment "We should pull their changes before continuing. Brace for"
comment "a code conflict!"
pcommand git rebase-update
echo Fetching origin
-git fetch origin 2>&1 | grep -v 'stage'
+git fetch origin 2>&1 | grep -v 'stage' | sed 's+From.*+From https://upstream+'
silent git tag -d $(git tag -l 'stage_*')
echo Rebasing: chap2
silent git rebase-update
« no previous file with comments | « docs/src/common_demo_functions.sh ('k') | docs/src/filter_demo_output.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698