libv8 7.4.288.28.0beta1 → 7.8.279.23.0beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +0 -1
- data/lib/libv8/version.rb +1 -1
- data/vendor/depot_tools/annotated_gclient.py +2 -4
- data/vendor/depot_tools/auth.py +0 -2
- data/vendor/depot_tools/autoninja +1 -3
- data/vendor/depot_tools/autoninja.bat +1 -1
- data/vendor/depot_tools/autoninja.py +1 -3
- data/vendor/depot_tools/bb +1 -1
- data/vendor/depot_tools/bootstrap/win/manifest.txt +1 -1
- data/vendor/depot_tools/buildbucket.py +6 -8
- data/vendor/depot_tools/checkout.py +5 -7
- data/vendor/depot_tools/cipd +1 -1
- data/vendor/depot_tools/cipd_manifest.txt +4 -4
- data/vendor/depot_tools/cipd_manifest.versions +80 -80
- data/vendor/depot_tools/cit.py +7 -9
- data/vendor/depot_tools/clang_format.py +1 -4
- data/vendor/depot_tools/clang_format_merge_driver.py +7 -9
- data/vendor/depot_tools/compile_single_file.py +1 -3
- data/vendor/depot_tools/dart_format.py +2 -4
- data/vendor/depot_tools/depot-tools-auth.py +8 -10
- data/vendor/depot_tools/fix_encoding.py +2 -5
- data/vendor/depot_tools/gclient-new-workdir.py +0 -2
- data/vendor/depot_tools/gclient.py +9 -8
- data/vendor/depot_tools/gclient_scm.py +28 -54
- data/vendor/depot_tools/gclient_utils.py +4 -14
- data/vendor/depot_tools/gerrit_util.py +6 -8
- data/vendor/depot_tools/git_cache.py +37 -53
- data/vendor/depot_tools/git_cl.py +42 -115
- data/vendor/depot_tools/git_drover.py +1 -3
- data/vendor/depot_tools/git_find_releases.py +6 -8
- data/vendor/depot_tools/git_footers.py +5 -7
- data/vendor/depot_tools/git_freezer.py +1 -3
- data/vendor/depot_tools/git_map_branches.py +5 -7
- data/vendor/depot_tools/git_mark_merge_base.py +6 -8
- data/vendor/depot_tools/git_nav_downstream.py +5 -7
- data/vendor/depot_tools/git_number.py +1 -3
- data/vendor/depot_tools/git_rebase_update.py +43 -38
- data/vendor/depot_tools/git_reparent_branch.py +6 -8
- data/vendor/depot_tools/git_upstream_diff.py +2 -4
- data/vendor/depot_tools/gn.py +4 -6
- data/vendor/depot_tools/infra/config/recipes.cfg +1 -1
- data/vendor/depot_tools/led +1 -1
- data/vendor/depot_tools/luci-auth +1 -1
- data/vendor/depot_tools/lucicfg +1 -1
- data/vendor/depot_tools/mac_toolchain +1 -1
- data/vendor/depot_tools/man/html/depot_tools.html +1 -1
- data/vendor/depot_tools/man/html/depot_tools_tutorial.html +22 -28
- data/vendor/depot_tools/man/html/git-cl.html +1 -1
- data/vendor/depot_tools/man/html/git-drover.html +18 -18
- data/vendor/depot_tools/man/html/git-footers.html +1 -1
- data/vendor/depot_tools/man/html/git-freeze.html +3 -3
- data/vendor/depot_tools/man/html/git-hyper-blame.html +1 -1
- data/vendor/depot_tools/man/html/git-map-branches.html +2 -2
- data/vendor/depot_tools/man/html/git-map.html +1 -1
- data/vendor/depot_tools/man/html/git-mark-merge-base.html +1 -1
- data/vendor/depot_tools/man/html/git-nav-downstream.html +3 -3
- data/vendor/depot_tools/man/html/git-nav-upstream.html +6 -12
- data/vendor/depot_tools/man/html/git-new-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-rebase-update.html +1 -20
- data/vendor/depot_tools/man/html/git-rename-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-reparent-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-retry.html +1 -1
- data/vendor/depot_tools/man/html/git-squash-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-thaw.html +1 -1
- data/vendor/depot_tools/man/html/git-upstream-diff.html +6 -10
- data/vendor/depot_tools/man/man1/git-cl.1 +4 -4
- data/vendor/depot_tools/man/man1/git-drover.1 +21 -21
- data/vendor/depot_tools/man/man1/git-footers.1 +4 -4
- data/vendor/depot_tools/man/man1/git-freeze.1 +6 -6
- data/vendor/depot_tools/man/man1/git-hyper-blame.1 +4 -4
- data/vendor/depot_tools/man/man1/git-map-branches.1 +4 -4
- data/vendor/depot_tools/man/man1/git-map.1 +4 -4
- data/vendor/depot_tools/man/man1/git-mark-merge-base.1 +4 -4
- data/vendor/depot_tools/man/man1/git-nav-downstream.1 +6 -6
- data/vendor/depot_tools/man/man1/git-nav-upstream.1 +9 -15
- data/vendor/depot_tools/man/man1/git-new-branch.1 +3 -3
- data/vendor/depot_tools/man/man1/git-rebase-update.1 +4 -14
- data/vendor/depot_tools/man/man1/git-rename-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-reparent-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-retry.1 +4 -4
- data/vendor/depot_tools/man/man1/git-squash-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-thaw.1 +4 -4
- data/vendor/depot_tools/man/man1/git-upstream-diff.1 +13 -7
- data/vendor/depot_tools/man/man7/depot_tools.7 +4 -4
- data/vendor/depot_tools/man/man7/depot_tools_tutorial.7 +27 -33
- data/vendor/depot_tools/man/src/filter_demo_output.py +1 -3
- data/vendor/depot_tools/man/src/git-rebase-update.txt +0 -7
- data/vendor/depot_tools/my_activity.py +11 -13
- data/vendor/depot_tools/my_reviews.py +29 -34
- data/vendor/depot_tools/ninjalog_uploader_wrapper.py +2 -4
- data/vendor/depot_tools/owners_finder.py +1 -3
- data/vendor/depot_tools/patch.py +1 -1
- data/vendor/depot_tools/post_build_ninja_summary.py +15 -17
- data/vendor/depot_tools/presubmit_canned_checks.py +1 -3
- data/vendor/depot_tools/presubmit_support.py +5 -10
- data/vendor/depot_tools/prpc +1 -1
- data/vendor/depot_tools/recipes/README.recipes.md +17 -17
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +4 -2
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json +5 -0
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json +4 -2
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json +5 -25
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json +5 -23
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json +5 -23
- data/vendor/depot_tools/recipes/recipe_modules/gclient/config.py +6 -0
- data/vendor/depot_tools/recipes/recipe_modules/gclient/examples/full.py +1 -0
- data/vendor/depot_tools/recipes/recipe_modules/gerrit/examples/full.expected/basic.json +5 -1
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json +5 -0
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/set_failure_hash_with_no_steps.json +3 -1
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch_luci.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch_new.json +6 -4
- data/vendor/depot_tools/rietveld.py +1 -3
- data/vendor/depot_tools/roll_dep.py +0 -2
- data/vendor/depot_tools/roll_dep_svn.py +11 -14
- data/vendor/depot_tools/scm.py +5 -10
- data/vendor/depot_tools/split_cl.py +11 -13
- data/vendor/depot_tools/subprocess2.py +1 -1
- data/vendor/depot_tools/third_party/colorama/LICENSE.txt +1 -0
- data/vendor/depot_tools/third_party/colorama/README.chromium +5 -4
- data/vendor/depot_tools/third_party/colorama/README.txt +304 -0
- data/vendor/depot_tools/third_party/colorama/__init__.py +4 -3
- data/vendor/depot_tools/third_party/colorama/ansi.py +30 -82
- data/vendor/depot_tools/third_party/colorama/ansitowin32.py +37 -105
- data/vendor/depot_tools/third_party/colorama/initialise.py +15 -39
- data/vendor/depot_tools/third_party/colorama/win32.py +28 -46
- data/vendor/depot_tools/third_party/colorama/winterm.py +31 -80
- data/vendor/depot_tools/third_party/upload.py +1 -1
- data/vendor/depot_tools/upload_to_google_storage.py +6 -8
- data/vendor/depot_tools/vpython +1 -1
- data/vendor/depot_tools/watchlists.py +3 -5
- data/vendor/depot_tools/weekly +2 -4
- data/vendor/depot_tools/win_toolchain/get_toolchain_if_necessary.py +36 -38
- data/vendor/depot_tools/win_toolchain/package_from_installed.py +8 -10
- data/vendor/depot_tools/wtf +3 -5
- metadata +3 -3
- data/vendor/depot_tools/third_party/colorama/README.rst +0 -346
data/vendor/depot_tools/lucicfg
CHANGED
@@ -927,7 +927,7 @@ Print a diff of the current branch, compared to its upstream.
|
|
927
927
|
<div id="footnotes"><hr /></div>
|
928
928
|
<div id="footer">
|
929
929
|
<div id="footer-text">
|
930
|
-
Last updated
|
930
|
+
Last updated 2017-02-27 13:47:35 PST
|
931
931
|
</div>
|
932
932
|
</div>
|
933
933
|
</body>
|
@@ -1253,11 +1253,11 @@ It was a Domo-Kuun.
|
|
1253
1253
|
* <span style="font-weight: bold; color: #e42e16">2250f53 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ ozone: evdev: Filter devices by path
|
1254
1254
|
* <span style="font-weight: bold; color: #e42e16">33a7a74 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Always output seccomp error messages to stderr
|
1255
1255
|
<span style="font-weight: bold; color: #ffffff">$ git status</span>
|
1256
|
-
On branch fix_typo
|
1257
|
-
Your branch is ahead of 'origin/master' by 1 commit.
|
1258
|
-
|
1259
|
-
|
1260
|
-
nothing to commit, working
|
1256
|
+
# On branch fix_typo
|
1257
|
+
# Your branch is ahead of 'origin/master' by 1 commit.
|
1258
|
+
# (use "git push" to publish your local commits)
|
1259
|
+
#
|
1260
|
+
nothing to commit, working directory clean
|
1261
1261
|
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r domo@chromium.org --send-mail</span>
|
1262
1262
|
... truncated output ...
|
1263
1263
|
</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 chap2</span>
|
@@ -1272,15 +1272,15 @@ overhead, barely disturbing the thick cigarette smoke. No doubt was left about
|
|
1272
1272
|
when the fan was last cleaned.
|
1273
1273
|
EOF
|
1274
1274
|
<span style="font-weight: bold; color: #ffffff">$ git status</span>
|
1275
|
-
On branch chap2
|
1276
|
-
Your branch is up
|
1277
|
-
|
1278
|
-
Changes not staged for commit:
|
1279
|
-
|
1280
|
-
|
1281
|
-
|
1282
|
-
<span style="color: #e42e16">modified: build/whitespace_file.txt</span>
|
1283
|
-
|
1275
|
+
# On branch chap2
|
1276
|
+
# Your branch is up-to-date with 'origin/master'.
|
1277
|
+
#
|
1278
|
+
# Changes not staged for commit:
|
1279
|
+
# (use "git add <file>..." to update what will be committed)
|
1280
|
+
# (use "git checkout -- <file>..." to discard changes in working directory)
|
1281
|
+
#
|
1282
|
+
# <span style="color: #e42e16">modified: build/whitespace_file.txt</span>
|
1283
|
+
#
|
1284
1284
|
no changes added to commit (use "git add" and/or "git commit -a")
|
1285
1285
|
</code></pre></div></div><p><div class="paragraph"> Someone on the code review pointed 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: bold; color: #ffffff">$ git freeze</span>
|
1286
1286
|
<span style="font-weight: bold; color: #ffffff">$ git checkout fix_typo</span>
|
@@ -1328,26 +1328,20 @@ It was a Domo-<span style="color: #e42e16">Banana</span><span style="color: #19c
|
|
1328
1328
|
</span><span style="color: #19c518"></span><span style="color: #19c518"> chap2
|
1329
1329
|
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> fix_typo *
|
1330
1330
|
</span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
|
1331
|
-
Note:
|
1331
|
+
Note: checking out 'origin/master'.
|
1332
1332
|
|
1333
1333
|
You are in 'detached HEAD' state. You can look around, make experimental
|
1334
1334
|
changes and commit them, and you can discard any commits you make in this
|
1335
|
-
state without impacting any branches by
|
1335
|
+
state without impacting any branches by performing another checkout.
|
1336
1336
|
|
1337
1337
|
If you want to create a new branch to retain commits you create, you may
|
1338
|
-
do so (now or later) by using -
|
1339
|
-
|
1340
|
-
git switch -c <new-branch-name>
|
1341
|
-
|
1342
|
-
Or undo this operation with:
|
1343
|
-
|
1344
|
-
git switch -
|
1338
|
+
do so (now or later) by using -b with the checkout command again. Example:
|
1345
1339
|
|
1346
|
-
|
1340
|
+
git checkout -b <new-branch-name>
|
1347
1341
|
|
1348
|
-
HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
|
1342
|
+
HEAD is now at beec6f4... Make ReflectorImpl use mailboxes
|
1349
1343
|
<span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
|
1350
|
-
Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
|
1344
|
+
Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes
|
1351
1345
|
Switched to branch 'chap2'
|
1352
1346
|
Your branch is ahead of 'origin/master' by 1 commit.
|
1353
1347
|
(use "git push" to publish your local commits)
|
@@ -1476,7 +1470,7 @@ Rebasing: chap2
|
|
1476
1470
|
There was an poignant pause.
|
1477
1471
|
|
1478
1472
|
CHAPTER 3:
|
1479
|
-
<span style="color: #19c518">++<<<<<<<
|
1473
|
+
<span style="color: #19c518">++<<<<<<< 59cdb7335b1c3a159ecc22214441cbe2194de25c</span>
|
1480
1474
|
<span style="color: #19c518"> +Hilariousness! This chapter is awesome!</span>
|
1481
1475
|
<span style="color: #19c518">++=======</span>
|
1482
1476
|
<span style="color: #19c518">+ Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
|
@@ -1586,7 +1580,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
1586
1580
|
<div id="footnotes"><hr /></div>
|
1587
1581
|
<div id="footer">
|
1588
1582
|
<div id="footer-text">
|
1589
|
-
Last updated
|
1583
|
+
Last updated 2016-12-15 15:36:52 PST
|
1590
1584
|
</div>
|
1591
1585
|
</div>
|
1592
1586
|
</body>
|
@@ -1026,7 +1026,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
1026
1026
|
<div id="footnotes"><hr /></div>
|
1027
1027
|
<div id="footer">
|
1028
1028
|
<div id="footer-text">
|
1029
|
-
Last updated
|
1029
|
+
Last updated 2017-06-21 09:37:12 PDT
|
1030
1030
|
</div>
|
1031
1031
|
</div>
|
1032
1032
|
</body>
|
@@ -858,7 +858,7 @@ at least once to fetch the branches.</p></div>
|
|
858
858
|
<h4 id="_merge_example">Merge Example</h4>
|
859
859
|
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
|
860
860
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
861
|
-
<span style="color: #e7e71c">commit
|
861
|
+
<span style="color: #e7e71c">commit c4c505c80a710432a95089cd7dca83e801bd3787</span>
|
862
862
|
Author: some.committer <some.committer@chromium.org>
|
863
863
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
864
864
|
Commit: some.committer <some.committer@chromium.org>
|
@@ -867,10 +867,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
867
867
|
This change needs to go to branch 9999
|
868
868
|
|
869
869
|
# Now do the 'drover'.
|
870
|
-
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick
|
870
|
+
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick c4c505c80a710432a95089cd7dca83e801bd3787</span>
|
871
871
|
Going to cherry-pick
|
872
872
|
"""
|
873
|
-
<span style="color: #e7e71c">commit
|
873
|
+
<span style="color: #e7e71c">commit c4c505c80a710432a95089cd7dca83e801bd3787</span>
|
874
874
|
Author: some.committer <some.committer@chromium.org>
|
875
875
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
876
876
|
|
@@ -888,7 +888,7 @@ About to land on 9999. Continue (y/n)? y
|
|
888
888
|
<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
|
889
889
|
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
|
890
890
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
891
|
-
<span style="color: #e7e71c">commit
|
891
|
+
<span style="color: #e7e71c">commit 1bf3c1360a47ee7db9ab3a1960bada575652ab18</span>
|
892
892
|
Author: some.committer <some.committer@chromium.org>
|
893
893
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
894
894
|
Commit: some.committer <some.committer@chromium.org>
|
@@ -897,10 +897,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
897
897
|
This change needs to go to branch 9999
|
898
898
|
|
899
899
|
# Now do the 'drover'.
|
900
|
-
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick
|
900
|
+
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 1bf3c1360a47ee7db9ab3a1960bada575652ab18</span>
|
901
901
|
Going to cherry-pick
|
902
902
|
"""
|
903
|
-
<span style="color: #e7e71c">commit
|
903
|
+
<span style="color: #e7e71c">commit 1bf3c1360a47ee7db9ab3a1960bada575652ab18</span>
|
904
904
|
Author: some.committer <some.committer@chromium.org>
|
905
905
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
906
906
|
|
@@ -938,28 +938,28 @@ About to land on 9999. Continue (y/n)? y
|
|
938
938
|
|
939
939
|
# Checkout the branch with the change we want to revert.
|
940
940
|
<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
|
941
|
-
Branch
|
941
|
+
Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
|
942
942
|
|
943
943
|
# Here's the commit we want to revert.
|
944
944
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
|
945
|
-
<span style="color: #e7e71c">commit
|
945
|
+
<span style="color: #e7e71c">commit 62b99a198636d608dd761b8f87714627154dbd34</span>
|
946
946
|
Author: some.committer <some.committer@chromium.org>
|
947
947
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
948
948
|
|
949
949
|
This change is horribly broken.
|
950
950
|
|
951
951
|
# Now do the revert.
|
952
|
-
<span style="font-weight: bold; color: #ffffff">$ git revert
|
952
|
+
<span style="font-weight: bold; color: #ffffff">$ git revert 62b99a198636d608dd761b8f87714627154dbd34</span>
|
953
953
|
|
954
954
|
# That reverted the change and committed the revert.
|
955
955
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
|
956
|
-
<span style="color: #e7e71c">commit
|
956
|
+
<span style="color: #e7e71c">commit 5ae4e652a29fd78de0ef0a9560878e5ae95c6c82</span>
|
957
957
|
Author: you <you@chromium.org>
|
958
958
|
Date: Thu Apr 10 09:11:36 2014 +0000
|
959
959
|
|
960
960
|
Revert "This change is horribly broken."
|
961
961
|
|
962
|
-
This reverts commit
|
962
|
+
This reverts commit 62b99a198636d608dd761b8f87714627154dbd34.
|
963
963
|
|
964
964
|
# As with old drover, reverts are generally OK to commit without LGTM.
|
965
965
|
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committer@chromium.org --send-mail</span>
|
@@ -976,7 +976,7 @@ button on the original cherrypick CL.</p></div>
|
|
976
976
|
|
977
977
|
# Here's a commit (from some.committer) that we want to 'drover'.
|
978
978
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
979
|
-
<span style="color: #e7e71c">commit
|
979
|
+
<span style="color: #e7e71c">commit 91ee663980fecd3bb7d6e8e166458e84b4e02d99</span>
|
980
980
|
Author: some.committer <some.committer@chromium.org>
|
981
981
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
982
982
|
Commit: some.committer <some.committer@chromium.org>
|
@@ -986,12 +986,12 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
986
986
|
|
987
987
|
# Checkout the branch we want to 'drover' to.
|
988
988
|
<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
|
989
|
-
Branch
|
989
|
+
Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
|
990
990
|
|
991
991
|
# Now do the 'drover'.
|
992
992
|
# IMPORTANT!!! Do Not leave off the '-x' flag
|
993
|
-
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x
|
994
|
-
[drover_9999
|
993
|
+
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 91ee663980fecd3bb7d6e8e166458e84b4e02d99</span>
|
994
|
+
[drover_9999 73a5705] This change needs to go to branch 9999
|
995
995
|
Author: some.committer <some.committer@chromium.org>
|
996
996
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
997
997
|
1 file changed, 1 insertion(+)
|
@@ -1000,7 +1000,7 @@ Branch 'drover_9999' set up to track remote ref 'refs/branch-heads/9999'.
|
|
1000
1000
|
# That took the code authored by some.committer and committed it to
|
1001
1001
|
# the branch by the person who drovered it (i.e. you).
|
1002
1002
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
1003
|
-
<span style="color: #e7e71c">commit
|
1003
|
+
<span style="color: #e7e71c">commit 73a5705417e67c31f93d27fdee8240204082b5ef</span>
|
1004
1004
|
Author: some.committer <some.committer@chromium.org>
|
1005
1005
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
1006
1006
|
Commit: you <you@chromium.org>
|
@@ -1008,7 +1008,7 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
|
|
1008
1008
|
|
1009
1009
|
This change needs to go to branch 9999
|
1010
1010
|
|
1011
|
-
(cherry picked from commit
|
1011
|
+
(cherry picked from commit 91ee663980fecd3bb7d6e8e166458e84b4e02d99)
|
1012
1012
|
|
1013
1013
|
# Looks good. Ship it!
|
1014
1014
|
<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
|
@@ -1041,7 +1041,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
1041
1041
|
<div id="footnotes"><hr /></div>
|
1042
1042
|
<div id="footer">
|
1043
1043
|
<div id="footer-text">
|
1044
|
-
Last updated
|
1044
|
+
Last updated 2017-06-21 09:37:12 PDT
|
1045
1045
|
</div>
|
1046
1046
|
</div>
|
1047
1047
|
</body>
|
@@ -871,7 +871,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
871
871
|
<div id="footnotes"><hr /></div>
|
872
872
|
<div id="footer">
|
873
873
|
<div id="footer-text">
|
874
|
-
Last updated
|
874
|
+
Last updated 2016-12-15 15:36:52 PST
|
875
875
|
</div>
|
876
876
|
</div>
|
877
877
|
</body>
|
@@ -790,7 +790,7 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
|
|
790
790
|
<span style="font-weight: bold; color: #ffffff">$ git freeze</span>
|
791
791
|
<span style="font-weight: bold; color: #ffffff">$ git status --short</span>
|
792
792
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
|
793
|
-
<span style="color: #e7e71c">commit
|
793
|
+
<span style="color: #e7e71c">commit c819cf561064339cde3dff88311c4fa63ce35d5c</span>
|
794
794
|
Author: local <local@chromium.org>
|
795
795
|
Date: Thu Apr 10 08:54:56 2014 +0000
|
796
796
|
|
@@ -802,7 +802,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
|
|
802
802
|
unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
|
803
803
|
4 files changed, 2 insertions(+), 1 deletion(-)
|
804
804
|
|
805
|
-
<span style="color: #e7e71c">commit
|
805
|
+
<span style="color: #e7e71c">commit 5ab592982f141dd6857ee2ddd4aa5b97e2c13746</span>
|
806
806
|
Author: local <local@chromium.org>
|
807
807
|
Date: Thu Apr 10 08:54:56 2014 +0000
|
808
808
|
|
@@ -852,7 +852,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
852
852
|
<div id="footnotes"><hr /></div>
|
853
853
|
<div id="footer">
|
854
854
|
<div id="footer-text">
|
855
|
-
Last updated
|
855
|
+
Last updated 2016-12-15 15:36:52 PST
|
856
856
|
</div>
|
857
857
|
</div>
|
858
858
|
</body>
|
@@ -871,7 +871,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
871
871
|
<div id="footnotes"><hr /></div>
|
872
872
|
<div id="footer">
|
873
873
|
<div id="footer-text">
|
874
|
-
Last updated
|
874
|
+
Last updated 2016-12-15 15:36:52 PST
|
875
875
|
</div>
|
876
876
|
</div>
|
877
877
|
</body>
|
@@ -862,7 +862,7 @@ assuming that the <code>frozen_changes</code> branch was currently checked out,
|
|
862
862
|
</span><span style="color: #e42e16"></span><span style="color: #e42e16">origin/master </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">
|
863
863
|
</span><span style="color: #19c518"></span><span style="color: #19c518"> cool_feature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 4 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
|
864
864
|
</span><span style="color: #19c518"></span><span style="color: #19c518"> subfeature </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 2 </span><span style="color: #ffffff">| </span><span style="color: #d338d3">behind 1 </span><span style="color: #ffffff">]
|
865
|
-
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead
|
865
|
+
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit </span><span style="color: #ffffff">[ </span><span style="color: #d338d3">ahead 6 </span><span style="color: #ffffff"> </span><span style="color: #d338d3"> </span><span style="color: #ffffff">]
|
866
866
|
</span><span style="color: #33d6e5"></span><span style="font-weight: bold; color: #33d6e5"> frozen_branch * </span><span style="font-weight: bold; color: #ffffff">[ </span><span style="font-weight: bold; color: #d338d3">ahead 3 </span><span style="font-weight: bold; color: #ffffff"> </span><span style="font-weight: bold; color: #d338d3"> </span><span style="font-weight: bold; color: #ffffff">]</span>
|
867
867
|
</code></pre></div></div><p><div class="paragraph"></p></div>
|
868
868
|
</div>
|
@@ -897,7 +897,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
897
897
|
<div id="footnotes"><hr /></div>
|
898
898
|
<div id="footer">
|
899
899
|
<div id="footer-text">
|
900
|
-
Last updated
|
900
|
+
Last updated 2018-12-04 11:07:30 CET
|
901
901
|
</div>
|
902
902
|
</div>
|
903
903
|
</body>
|
@@ -880,7 +880,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
880
880
|
<div id="footnotes"><hr /></div>
|
881
881
|
<div id="footer">
|
882
882
|
<div id="footer-text">
|
883
|
-
Last updated
|
883
|
+
Last updated 2016-12-15 15:36:52 PST
|
884
884
|
</div>
|
885
885
|
</div>
|
886
886
|
</body>
|
@@ -819,7 +819,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
819
819
|
<div id="footnotes"><hr /></div>
|
820
820
|
<div id="footer">
|
821
821
|
<div id="footer-text">
|
822
|
-
Last updated
|
822
|
+
Last updated 2016-12-15 15:36:52 PST
|
823
823
|
</div>
|
824
824
|
</div>
|
825
825
|
</body>
|
@@ -779,7 +779,7 @@ command will prompt you with a selection of the branches.</p></div>
|
|
779
779
|
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
|
780
780
|
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
|
781
781
|
</span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
|
782
|
-
Previous HEAD position was beec6f4 Make ReflectorImpl use mailboxes
|
782
|
+
Previous HEAD position was beec6f4... Make ReflectorImpl use mailboxes
|
783
783
|
Switched to branch 'cool_feature'
|
784
784
|
Your branch is ahead of 'origin/master' by 4 commits.
|
785
785
|
(use "git push" to publish your local commits)
|
@@ -796,7 +796,7 @@ Selection (0-1)[0]: 0
|
|
796
796
|
</span><span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
|
797
797
|
Switched to branch 'subfeature'
|
798
798
|
Your branch and 'cool_feature' have diverged,
|
799
|
-
and have 2 and 1 different
|
799
|
+
and have 2 and 1 different commit each, respectively.
|
800
800
|
(use "git pull" to merge the remote branch into yours)
|
801
801
|
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
|
802
802
|
<span style="color: #e42e16"></span><span style="color: #e42e16">origin/master
|
@@ -837,7 +837,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
837
837
|
<div id="footnotes"><hr /></div>
|
838
838
|
<div id="footer">
|
839
839
|
<div id="footer-text">
|
840
|
-
Last updated
|
840
|
+
Last updated 2016-12-15 15:36:52 PST
|
841
841
|
</div>
|
842
842
|
</div>
|
843
843
|
</body>
|
@@ -787,24 +787,18 @@ Your branch is ahead of 'origin/master' by 4 commits.
|
|
787
787
|
</span><span style="color: #19c518"></span><span style="color: #19c518"> fixit
|
788
788
|
</span><span style="color: #19c518"></span><span style="color: #19c518"> frozen_branch
|
789
789
|
</span><span style="font-weight: bold; color: #ffffff">$ git nav-upstream</span>
|
790
|
-
Note:
|
790
|
+
Note: checking out 'origin/master'.
|
791
791
|
|
792
792
|
You are in 'detached HEAD' state. You can look around, make experimental</span> <b><1></b><span>
|
793
793
|
changes and commit them, and you can discard any commits you make in this
|
794
|
-
state without impacting any branches by
|
794
|
+
state without impacting any branches by performing another checkout.
|
795
795
|
|
796
796
|
If you want to create a new branch to retain commits you create, you may
|
797
|
-
do so (now or later) by using -
|
797
|
+
do so (now or later) by using -b with the checkout command again. Example:
|
798
798
|
|
799
|
-
git
|
799
|
+
git checkout -b <new-branch-name>
|
800
800
|
|
801
|
-
|
802
|
-
|
803
|
-
git switch -
|
804
|
-
|
805
|
-
Turn off this advice by setting config variable advice.detachedHead to false
|
806
|
-
|
807
|
-
HEAD is now at beec6f4 Make ReflectorImpl use mailboxes
|
801
|
+
HEAD is now at beec6f4... Make ReflectorImpl use mailboxes
|
808
802
|
<span style="font-weight: bold; color: #ffffff">$ git map-branches</span>
|
809
803
|
<span style="color: #e42e16"></span><span style="font-weight: bold; color: #e42e16">origin/master
|
810
804
|
</span><span style="font-weight: bold; color: #19c518"></span><span style="color: #19c518"> cool_feature
|
@@ -846,7 +840,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
846
840
|
<div id="footnotes"><hr /></div>
|
847
841
|
<div id="footer">
|
848
842
|
<div id="footer-text">
|
849
|
-
Last updated
|
843
|
+
Last updated 2016-12-15 15:36:52 PST
|
850
844
|
</div>
|
851
845
|
</div>
|
852
846
|
</body>
|
@@ -925,7 +925,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
925
925
|
<div id="footnotes"><hr /></div>
|
926
926
|
<div id="footer">
|
927
927
|
<div id="footer-text">
|
928
|
-
Last updated
|
928
|
+
Last updated 2018-12-05 15:20:42 CET
|
929
929
|
</div>
|
930
930
|
</div>
|
931
931
|
</body>
|
@@ -846,17 +846,6 @@ Restoration
|
|
846
846
|
<div class="sectionbody">
|
847
847
|
<div class="dlist"><dl>
|
848
848
|
<dt class="hdlist1">
|
849
|
-
-k
|
850
|
-
</dt>
|
851
|
-
<dt class="hdlist1">
|
852
|
-
--keep-going
|
853
|
-
</dt>
|
854
|
-
<dd>
|
855
|
-
<p>
|
856
|
-
Keep processing past failed rebases.
|
857
|
-
</p>
|
858
|
-
</dd>
|
859
|
-
<dt class="hdlist1">
|
860
849
|
-n
|
861
850
|
</dt>
|
862
851
|
<dt class="hdlist1">
|
@@ -878,14 +867,6 @@ Restoration
|
|
878
867
|
More text than your terminal can handle.
|
879
868
|
</p>
|
880
869
|
</dd>
|
881
|
-
<dt class="hdlist1">
|
882
|
-
--current
|
883
|
-
</dt>
|
884
|
-
<dd>
|
885
|
-
<p>
|
886
|
-
Only rebase the current branch.
|
887
|
-
</p>
|
888
|
-
</dd>
|
889
870
|
</dl></div>
|
890
871
|
</div>
|
891
872
|
</div>
|
@@ -954,7 +935,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
|
|
954
935
|
<div id="footnotes"><hr /></div>
|
955
936
|
<div id="footer">
|
956
937
|
<div id="footer-text">
|
957
|
-
Last updated
|
938
|
+
Last updated 2016-12-15 15:36:52 PST
|
958
939
|
</div>
|
959
940
|
</div>
|
960
941
|
</body>
|