Created
September 14, 2015 08:50
-
-
Save primiano/849b2b9431b3c171f645 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ curl -q https://storage.googleapis.com/primiano-misc/cl_1323333002_ps2.bundle -o /tmp/bundle | |
% Total % Received % Xferd Average Speed Time Time Time Current | |
Dload Upload Total Spent Left Speed | |
100 69460 100 69460 0 0 73411 0 --:--:-- --:--:-- --:--:-- 73424 | |
$ git fetch /tmp/bundle cl_1323333002_ps2:cl_1323333002_ps2 | |
From cl_1323333002_ps2.bundle | |
* [new branch] cl_1323333002_ps2 -> cl_1323333002_ps2 | |
##################################### | |
##### SIMULATE SYNC TO NEW CL ##### | |
##################################### | |
$ git checkout cl_1323333002_ps2 | |
$ gclient sync -j8 | |
... | |
... | |
Warnings: | |
Conflicting directory /s/chrome-test/src/third_party/libvpx/source/libvpx moved to /s/chrome-test/_bad_scm/src/third_party/libvpx/source/libvpxV1Ev_O. | |
$ git status | |
# On branch cl_1323333002_ps2 | |
# Untracked files: | |
# (use "git add <file>..." to include in what will be committed) | |
# | |
# third_party/libvpx/WATCHLISTS | |
# third_party/libvpx/codereview.settings | |
# | |
################################## | |
##### NOW GO BACK TO MASTER ##### | |
################################## | |
$ git checkout master | |
$ gclient sync -j8 | |
Syncing projects: 70% (73/104) src/third_party/openmax_dl | |
src/third_party/libvpx (ERROR) | |
---------------------------------------- | |
[0:00:01] Started. | |
---------------------------------------- | |
Error: 66> | |
66> ____ src/third_party/libvpx at 0304cef02fe5e94b63e7e78ddb263d91ca32d533 | |
66> You have unstaged changes. | |
66> Please commit, stash, or reset. | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment