Created
April 27, 2011 03:59
-
-
Save dch/943691 to your computer and use it in GitHub Desktop.
submodule update for iOS-Couchbase
This file contains hidden or 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
| dave@akai:~/source/mobile/iOS-Couchbase $ git stash | |
| Saved working directory and index state WIP on workspace: 0bc6e21 moved submodules to points where the build works | |
| HEAD is now at 0bc6e21 moved submodules to points where the build works | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git pull --verbose | |
| From git://github.com/couchbaselabs/iOS-Couchbase | |
| cfc2eb8..04fee19 master -> origin/master | |
| = [up to date] sim -> origin/sim | |
| 0bc6e21..f6ae191 workspace -> origin/workspace | |
| Updating 0bc6e21..f6ae191 | |
| Fast-forward | |
| .gitmodules | 2 +- | |
| 1 files changed, 1 insertions(+), 1 deletions(-) | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git status | |
| # On branch workspace | |
| # Changes not staged for commit: | |
| # (use "git add <file>..." to update what will be committed) | |
| # (use "git checkout -- <file>..." to discard changes in working directory) | |
| # | |
| # modified: Demo/Vendor/TouchJSON (new commits) | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git submodule init | |
| Submodule 'Demo/Vendor/TouchJSON' ([email protected]:arciem/TouchJSON.git) registered for path 'Demo/Vendor/TouchJSON' | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git submodule sync | |
| Synchronizing submodule url for 'Demo/Vendor/TouchFoundation' | |
| Synchronizing submodule url for 'Demo/Vendor/TouchJSON' | |
| Synchronizing submodule url for 'Demo/Vendor/trundle' | |
| Synchronizing submodule url for 'MobileCouchbase/Vendor/iErl14' | |
| Synchronizing submodule url for 'MobileCouchbase/Vendor/iMonkey' | |
| Synchronizing submodule url for 'MobileCouchbase/Vendor/ios-openssl' | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git submodule update | |
| remote: Counting objects: 34, done. | |
| remote: Compressing objects: 100% (25/25), done. | |
| remote: Total 26 (delta 13), reused 1 (delta 0) | |
| Unpacking objects: 100% (26/26), done. | |
| From github.com:arciem/TouchJSON | |
| 2abba33..85bc058 master -> origin/master | |
| Submodule path 'Demo/Vendor/TouchJSON': checked out '85bc0583a0c5ef1543f371634caa4529bc8f5e40' | |
| dave@akai:~/source/mobile/iOS-Couchbase $ open Couchbase.xcworkspace/ | |
| dave@akai:~/source/mobile/iOS-Couchbase $ curl http://localhost:62028/ | |
| {"couchdb":"Welcome","version":"1.0.1-emonk-ios"} | |
| dave@akai:~/source/mobile/iOS-Couchbase $ |
This file contains hidden or 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
| dave@akai:~/source/mobile/iOS-Couchbase $ git pull --verbose | |
| remote: Counting objects: 9, done. | |
| remote: Compressing objects: 100% (6/6), done. | |
| remote: Total 6 (delta 4), reused 0 (delta 0) | |
| Unpacking objects: 100% (6/6), done. | |
| From git://github.com/couchbaselabs/iOS-Couchbase | |
| cfc2eb8..04fee19 master -> origin/master | |
| = [up to date] sim -> origin/sim | |
| 0bc6e21..f6ae191 workspace -> origin/workspace | |
| Updating 0bc6e21..f6ae191 | |
| error: Your local changes to the following files would be overwritten by merge: | |
| .gitmodules | |
| Please, commit your changes or stash them before you can merge. | |
| Aborting | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git stash | |
| Saved working directory and index state WIP on workspace: 0bc6e21 moved submodules to points where the build works | |
| HEAD is now at 0bc6e21 moved submodules to points where the build works | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git pull --verbose | |
| From git://github.com/couchbaselabs/iOS-Couchbase | |
| cfc2eb8..04fee19 master -> origin/master | |
| = [up to date] sim -> origin/sim | |
| 0bc6e21..f6ae191 workspace -> origin/workspace | |
| Updating 0bc6e21..f6ae191 | |
| Fast-forward | |
| .gitmodules | 2 +- | |
| 1 files changed, 1 insertions(+), 1 deletions(-) | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git status | |
| # On branch workspace | |
| # Changes not staged for commit: | |
| # (use "git add <file>..." to update what will be committed) | |
| # (use "git checkout -- <file>..." to discard changes in working directory) | |
| # | |
| # modified: Demo/Vendor/TouchJSON (new commits) | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git submodule init | |
| Submodule 'Demo/Vendor/TouchJSON' ([email protected]:arciem/TouchJSON.git) registered for path 'Demo/Vendor/TouchJSON' | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git submodule sync | |
| Synchronizing submodule url for 'Demo/Vendor/TouchFoundation' | |
| Synchronizing submodule url for 'Demo/Vendor/TouchJSON' | |
| Synchronizing submodule url for 'Demo/Vendor/trundle' | |
| Synchronizing submodule url for 'MobileCouchbase/Vendor/iErl14' | |
| Synchronizing submodule url for 'MobileCouchbase/Vendor/iMonkey' | |
| Synchronizing submodule url for 'MobileCouchbase/Vendor/ios-openssl' | |
| dave@akai:~/source/mobile/iOS-Couchbase $ git submodule update | |
| remote: Counting objects: 34, done. | |
| remote: Compressing objects: 100% (25/25), done. | |
| remote: Total 26 (delta 13), reused 1 (delta 0) | |
| Unpacking objects: 100% (26/26), done. | |
| From github.com:arciem/TouchJSON | |
| 2abba33..85bc058 master -> origin/master | |
| Submodule path 'Demo/Vendor/TouchJSON': checked out '85bc0583a0c5ef1543f371634caa4529bc8f5e40' | |
| dave@akai:~/source/mobile/iOS-Couchbase $ open Couchbase.xcworkspace/ | |
| dave@akai:~/source/mobile/iOS-Couchbase $ curl http://localhost:62028/ | |
| {"couchdb":"Welcome","version":"1.0.1-emonk-ios"} | |
| dave@akai:~/source/mobile/iOS-Couchbase $ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment