search

CounterpartyXCP / counterwallet

Counterparty web wallet
https://counterwallet.io
147 stars 163 forks source link

Fix #627 - git warning about timeago i18n file #630

Closed digital-dreamer closed 9 years ago

digital-dreamer commented 9 years ago

jquery-timeago.i18n.js is generated by Grunt (from the js files in vendors/jquery-timego), based on language settings. It should not be included in the repository, because otherwise git will show warnings about local changes.

I also put it in .gitignore to prevent a locally generated file from being commited - this is what happened in 60cf658d22942348455afd3afc69f4747a771f87

Fixes #627

ghost commented 9 years ago

Just installed Fed Node ((U)pdated existing setup from master after @ouziel-slama released it)

Successfully installed gevent geventhttpclient grequests
Cleaning up...
2015-01-06 08:46:14,837|INFO: counterpartyd config file already exists at: '/home/xcp/.config/counterpartyd/counterpartyd.conf'
2015-01-06 08:46:14,837|INFO: counterblockd config file already exists at: '/home/xcp/.config/counterblockd/counterblockd.conf'
2015-01-06 08:46:14,837|INFO: SETUP DONE. (It's time to kick ass, and chew bubblegum... and I'm all outta gum.)
2015-01-06 08:46:14,850|INFO: Checking out/updating counterwallet:master from git...
2015-01-06 08:46:14,850|DEBUG: RUNNING COMMAND: cd /home/xcp/counterwallet && git pull origin master
From https://github.com/CounterpartyXCP/counterwallet
 * branch            master     -> FETCH_HEAD
Updating 78e6bbd..3e2f0bc
error: Your local changes to the following files would be overwritten by merge:
        src/js/jquery-timeago.i18n.js
Please, commit your changes or stash them before you can merge.
Aborting
2015-01-06 08:46:15,011|ERROR: Command failed: 'cd /home/xcp/counterwallet && git pull origin master'

I had to delete the file manually. Maybe the docs (or code) should be updated to get around such problems.

digital-dreamer commented 9 years ago

@rippler - your installation was in a broken state where you couldn't automatically pull anything from counterwallet repository, not even the patch that was just released. But I see you already figured out how to resolve this.

ghost commented 9 years ago

@digital-dreamer - I believe you, but I interfaced with the setup using the official install scripts. At the same time time I know I didn't follow best practices, because it's a test system. I'll make changes to the docs.

digital-dreamer commented 9 years ago

Good idea, you could add this to the troubleshooting section - what to do when a user gets the message that you saw during installation. A universal solution would be to go to the damaged project's folder (in this case /home/xcp/counterwallet) and issue git reset --hard This will discard any local changes to the files included in the repository (returning them to the state of the last commit), but won't affect files that are not tracked by git (so your counterwallet.conf.json will be preserved).

ghost commented 9 years ago

Done (on Support site, KB articles)