Update to Magento 2 stable release

[brendanfalkowski]

Thanks for jumping right on the M2 stable release. Tried to update the box today, but something went wrong. I went to the dir I cloned this repo on my Mac and ran:

git pull && git submodule update --init && vagrant provision

This is the output I got back:

remote: Counting objects: 16, done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 16 (delta 5), reused 5 (delta 5), pack-reused 8
Unpacking objects: 100% (16/16), done.
From github.com:rgranadino/mage2_vagrant
   97f2355..a8d69b7  master     -> origin/master
Fetching submodule data/magento2
remote: Counting objects: 121899, done.
remote: Compressing objects: 100% (2874/2874), done.
remote: Total 121899 (delta 46358), reused 44573 (delta 44573), pack-reused 74010
Receiving objects: 100% (121899/121899), 17.84 MiB | 1.75 MiB/s, done.
Resolving deltas: 100% (74485/74485), completed with 8198 local objects.
From https://github.com/magento/magento2
   c077da6..4cae5d0  develop    -> origin/develop
   9d4c58e..4cae5d0  master     -> origin/master
 * [new branch]      merchant_beta -> origin/merchant_beta
 * [new tag]         2.0.0      -> 2.0.0
 * [new tag]         1.0.0-beta2 -> 1.0.0-beta2
 * [new tag]         1.0.0-beta3 -> 1.0.0-beta3
 * [new tag]         1.0.0-beta4 -> 1.0.0-beta4
 * [new tag]         1.0.0-beta5 -> 1.0.0-beta5
 * [new tag]         1.0.0-beta6 -> 1.0.0-beta6
 * [new tag]         2.0.0-rc   -> 2.0.0-rc
 * [new tag]         2.0.0-rc2  -> 2.0.0-rc2
Updating 97f2355..a8d69b7
Fast-forward
 .gitmodules               |  3 +++
 README.md                 | 15 +++++++++++----
 Vagrantfile               |  5 ++---
 data/magento2             |  2 +-
 data/magento2-sample-data |  1 +
 files/reinstall.sh        | 14 +++++---------
 6 files changed, 23 insertions(+), 17 deletions(-)
 create mode 160000 data/magento2-sample-data
Submodule 'data/magento2-sample-data' (https://github.com/magento/magento2-sample-data.git) registered for path 'data/magento2-sample-data'
error: Your local changes to the following files would be overwritten by checkout:
    composer.json
    composer.lock
Please, commit your changes or stash them before you can switch branches.
error: The following untracked working tree files would be overwritten by checkout:
    app/code/Magento/SampleData/README.md
    app/code/Magento/SampleData/composer.json
    app/code/Magento/SampleData/etc/di.xml
    app/code/Magento/SampleData/etc/module.xml
Please move or remove them before you can switch branches.
Aborting
Cloning into 'data/magento2-sample-data'...
remote: Counting objects: 4771, done.
remote: Compressing objects: 100% (171/171), done.
remote: Total 4771 (delta 96), reused 0 (delta 0), pack-reused 4579
Receiving objects: 100% (4771/4771), 77.37 MiB | 1.07 MiB/s, done.
Resolving deltas: 100% (1560/1560), done.
Checking connectivity... done.
Submodule path 'data/magento2-sample-data': checked out '4987f3fbde8279b9366a859b760cad13e89a9354'
Unable to checkout '4cae5d058b7ad877b2ec7d2b6fa0a500f7c16860' in submodule path 'data/magento2'

There are no loose files in my working directory for this repo, but I'm a little hazy how git submodules work and fit into all this. This ENV was setup with sample data before.

[therouv]

Hi @brendanfalkowski it seems that you where using an older version of the vagrant box with the old Magento sample data. Magento changed a lot regarding the sample data.

I'd recommend to clone the repository again and set up again with the new sample data. The other option would be to reset the changed files to the latest git revision (e.g. git checkout -- composer.json && git checkout -- composer.lock) and then try to update&provision the vagrant box again.

[brendanfalkowski]

Thanks, I'll wipe it out and restart. Hopefully Magento settles down with the update compatibility after 2.0.0.

[rgranadino]

Agree with @therouv , wiping everything out is usually the "easier" approach. Otherwise you have to reset or remove the files that got modified in order to install the sample data. Hoping the same @brendanfalkowski...