[boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
Today I run again into the CR/LF pain when I pulled from BOINC upstream and me wonders how I can repair the repository using git-2.1.0 at a 32bit Linux without cloning the full repository again (as I did it in the past). FWIW I did not changed anything locally, I just do pull regularly from upstreem to create a tar-ball of the current version for my own purpose: tfoerste@n22 ~/devel/trinity $ cd ~/devel/boinc-v2; git pull remote: Counting objects: 104, done. remote: Compressing objects: 100% (52/52), done. remote: Total 52 (delta 42), reused 0 (delta 0) Unpacking objects: 100% (52/52), done. From git://boinc.berkeley.edu/boinc-v2 ce97e85..d2e5582 master - origin/master 194f1dc..4a696b4 client_release/7/7.4 - origin/client_release/7/7.4 Updating ce97e85..d2e5582 error: Your local changes to the following files would be overwritten by merge: html/languages/translations/hu.po html/languages/translations/nl.po locale/bg/BOINC-Web.po locale/da/BOINC-Web.po locale/el/BOINC-Web.po locale/fr/BOINC-Web.po locale/hr/BOINC-Web.po locale/hu/BOINC-Project-Generic.po locale/hu/BOINC-Web.po locale/it_IT/BOINC-Project-Generic.po locale/lv/BOINC-Web.po locale/nl/BOINC-Project-Generic.po locale/nl/BOINC-Web.po locale/pl/BOINC-Web.po locale/pt_BR/BOINC-Web.po locale/ro/BOINC-Web.po locale/sk/BOINC-Web.po locale/zh_TW/BOINC-Web.po Please, commit your changes or stash them before you can merge. Aborting tfoerste@n22 ~/devel/boinc-v2 $ git diff tfoerste@n22 ~/devel/boinc-v2 $ git status On branch master Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use git pull to update your local branch) 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: html/languages/translations/hu.po modified: html/languages/translations/nl.po modified: locale/bg/BOINC-Web.po modified: locale/da/BOINC-Web.po modified: locale/el/BOINC-Web.po modified: locale/fr/BOINC-Web.po modified: locale/hr/BOINC-Web.po modified: locale/hu/BOINC-Project-Generic.po modified: locale/hu/BOINC-Web.po modified: locale/it_IT/BOINC-Project-Generic.po modified: locale/lv/BOINC-Web.po modified: locale/nl/BOINC-Project-Generic.po modified: locale/nl/BOINC-Web.po modified: locale/pl/BOINC-Web.po modified: locale/pt_BR/BOINC-Web.po modified: locale/ro/BOINC-Web.po modified: locale/sk/BOINC-Web.po modified: locale/zh_TW/BOINC-Web.po no changes added to commit (use git add and/or git commit -a) tfoerste@n22 ~/devel/boinc-v2 $ git branch * master tfoerste@n22 ~/devel/boinc-v2 $ git stash warning: CRLF will be replaced by LF in html/languages/translations/hu.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in html/languages/translations/nl.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/bg/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/da/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/el/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/fr/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hr/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hu/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hu/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/it_IT/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/lv/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/nl/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/nl/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/pl/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/pt_BR/BOINC-Web.po. The file
Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
Try: git checkout -f master git pull origin I committed fixes for that stuff this morning. - Rom -Original Message- From: boinc_dev [mailto:boinc_dev-boun...@ssl.berkeley.edu] On Behalf Of Toralf Förster Sent: Friday, September 12, 2014 2:09 PM To: g...@vger.kernel.org Cc: boinc_dev@ssl.berkeley.edu Subject: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream Today I run again into the CR/LF pain when I pulled from BOINC upstream and me wonders how I can repair the repository using git-2.1.0 at a 32bit Linux without cloning the full repository again (as I did it in the past). FWIW I did not changed anything locally, I just do pull regularly from upstreem to create a tar-ball of the current version for my own purpose: tfoerste@n22 ~/devel/trinity $ cd ~/devel/boinc-v2; git pull remote: Counting objects: 104, done. remote: Compressing objects: 100% (52/52), done. remote: Total 52 (delta 42), reused 0 (delta 0) Unpacking objects: 100% (52/52), done. From git://boinc.berkeley.edu/boinc-v2 ce97e85..d2e5582 master - origin/master 194f1dc..4a696b4 client_release/7/7.4 - origin/client_release/7/7.4 Updating ce97e85..d2e5582 error: Your local changes to the following files would be overwritten by merge: html/languages/translations/hu.po html/languages/translations/nl.po locale/bg/BOINC-Web.po locale/da/BOINC-Web.po locale/el/BOINC-Web.po locale/fr/BOINC-Web.po locale/hr/BOINC-Web.po locale/hu/BOINC-Project-Generic.po locale/hu/BOINC-Web.po locale/it_IT/BOINC-Project-Generic.po locale/lv/BOINC-Web.po locale/nl/BOINC-Project-Generic.po locale/nl/BOINC-Web.po locale/pl/BOINC-Web.po locale/pt_BR/BOINC-Web.po locale/ro/BOINC-Web.po locale/sk/BOINC-Web.po locale/zh_TW/BOINC-Web.po Please, commit your changes or stash them before you can merge. Aborting tfoerste@n22 ~/devel/boinc-v2 $ git diff tfoerste@n22 ~/devel/boinc-v2 $ git status On branch master Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use git pull to update your local branch) 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: html/languages/translations/hu.po modified: html/languages/translations/nl.po modified: locale/bg/BOINC-Web.po modified: locale/da/BOINC-Web.po modified: locale/el/BOINC-Web.po modified: locale/fr/BOINC-Web.po modified: locale/hr/BOINC-Web.po modified: locale/hu/BOINC-Project-Generic.po modified: locale/hu/BOINC-Web.po modified: locale/it_IT/BOINC-Project-Generic.po modified: locale/lv/BOINC-Web.po modified: locale/nl/BOINC-Project-Generic.po modified: locale/nl/BOINC-Web.po modified: locale/pl/BOINC-Web.po modified: locale/pt_BR/BOINC-Web.po modified: locale/ro/BOINC-Web.po modified: locale/sk/BOINC-Web.po modified: locale/zh_TW/BOINC-Web.po no changes added to commit (use git add and/or git commit -a) tfoerste@n22 ~/devel/boinc-v2 $ git branch * master tfoerste@n22 ~/devel/boinc-v2 $ git stash warning: CRLF will be replaced by LF in html/languages/translations/hu.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in html/languages/translations/nl.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/bg/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/da/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/el/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/fr/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hr/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hu/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hu/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/it_IT/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/lv/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in
Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
On 09/12/2014 08:19 PM, Rom Walton wrote: Try: git checkout -f master git pull origin I committed fixes for that stuff this morning. doesn't helped : tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master Already on 'master' Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use git pull to update your local branch) tfoerste@n22 ~/devel/boinc-v2 $ git pull origin Updating ce97e85..d2e5582 error: Your local changes to the following files would be overwritten by merge: html/languages/translations/hu.po html/languages/translations/nl.po locale/bg/BOINC-Web.po locale/da/BOINC-Web.po locale/el/BOINC-Web.po locale/fr/BOINC-Web.po locale/hr/BOINC-Web.po locale/hu/BOINC-Project-Generic.po locale/hu/BOINC-Web.po locale/it_IT/BOINC-Project-Generic.po locale/lv/BOINC-Web.po locale/nl/BOINC-Project-Generic.po locale/nl/BOINC-Web.po locale/pl/BOINC-Web.po locale/pt_BR/BOINC-Web.po locale/ro/BOINC-Web.po locale/sk/BOINC-Web.po locale/zh_TW/BOINC-Web.po Please, commit your changes or stash them before you can merge. Aborting -- Toralf pgp key: 0076 E94E ___ boinc_dev mailing list boinc_dev@ssl.berkeley.edu http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
Crud... Well, personally, I would delete the locale directory and the two translation files in html. Do the 'git pull', and then switch between master and some other branch. like: git checkout -f client_release/7/7.4 git checkout -f master It is round about, but it should get the job done. - Rom -Original Message- From: Toralf Förster [mailto:toralf.foers...@gmx.de] Sent: Friday, September 12, 2014 2:32 PM To: Rom Walton; g...@vger.kernel.org Cc: boinc_dev@ssl.berkeley.edu Subject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream On 09/12/2014 08:19 PM, Rom Walton wrote: Try: git checkout -f master git pull origin I committed fixes for that stuff this morning. doesn't helped : tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master Already on 'master' Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use git pull to update your local branch) tfoerste@n22 ~/devel/boinc-v2 $ git pull origin Updating ce97e85..d2e5582 error: Your local changes to the following files would be overwritten by merge: html/languages/translations/hu.po html/languages/translations/nl.po locale/bg/BOINC-Web.po locale/da/BOINC-Web.po locale/el/BOINC-Web.po locale/fr/BOINC-Web.po locale/hr/BOINC-Web.po locale/hu/BOINC-Project-Generic.po locale/hu/BOINC-Web.po locale/it_IT/BOINC-Project-Generic.po locale/lv/BOINC-Web.po locale/nl/BOINC-Project-Generic.po locale/nl/BOINC-Web.po locale/pl/BOINC-Web.po locale/pt_BR/BOINC-Web.po locale/ro/BOINC-Web.po locale/sk/BOINC-Web.po locale/zh_TW/BOINC-Web.po Please, commit your changes or stash them before you can merge. Aborting -- Toralf pgp key: 0076 E94E ___ boinc_dev mailing list boinc_dev@ssl.berkeley.edu http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
On 09/12/2014 08:55 PM, Rom Walton wrote: Crud... Well, personally, I would delete the locale directory and the two translation files in html. Do the 'git pull', and then switch between master and some other branch. like: git checkout -f client_release/7/7.4 git checkout -f master It is round about, but it should get the job done. Re-cloning seems to be the only way, b/c : tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f client_release/7/7.4 Branch client_release/7/7.4 set up to track remote branch client_release/7/7.4 from origin. Switched to a new branch 'client_release/7/7.4' tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master Checking out files: 100% (234/234), done. Switched to branch 'master' Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use git pull to update your local branch) tfoerste@n22 ~/devel/boinc-v2 $ git pull Updating ce97e85..d2e5582 error: Your local changes to the following files would be overwritten by merge: ... same picture as before -- Toralf pgp key: 0076 E94E ___ boinc_dev mailing list boinc_dev@ssl.berkeley.edu http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
I found this: http://stackoverflow.com/questions/17223527/how-do-i-force-git-to-checkout-the-master-branch-and-remove-carriage-returns-aft That might help in the future. - Rom -Original Message- From: Toralf Förster [mailto:toralf.foers...@gmx.de] Sent: Friday, September 12, 2014 3:04 PM To: Rom Walton; g...@vger.kernel.org Cc: boinc_dev@ssl.berkeley.edu Subject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream On 09/12/2014 08:55 PM, Rom Walton wrote: Crud... Well, personally, I would delete the locale directory and the two translation files in html. Do the 'git pull', and then switch between master and some other branch. like: git checkout -f client_release/7/7.4 git checkout -f master It is round about, but it should get the job done. Re-cloning seems to be the only way, b/c : tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f client_release/7/7.4 Branch client_release/7/7.4 set up to track remote branch client_release/7/7.4 from origin. Switched to a new branch 'client_release/7/7.4' tfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master Checking out files: 100% (234/234), done. Switched to branch 'master' Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded. (use git pull to update your local branch) tfoerste@n22 ~/devel/boinc-v2 $ git pull Updating ce97e85..d2e5582 error: Your local changes to the following files would be overwritten by merge: ... same picture as before -- Toralf pgp key: 0076 E94E ___ boinc_dev mailing list boinc_dev@ssl.berkeley.edu http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
On Sep 12, 2014, at 11:19 AM, Rom Walton r...@romwnet.org wrote: I committed fixes for that stuff this morning. That actually made things worse. I now get the errors on a pull: git -c diff.mnemonicprefix=false -c core.quotepath=false -c credential.helper=sourcetree pull origin master From ssh://isaac.ssl.berkeley.edu/boinc-v2 * branchmaster - FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: html/languages/translations/hu.po html/languages/translations/nl.po locale/bg/BOINC-Web.po locale/da/BOINC-Web.po locale/el/BOINC-Web.po locale/fr/BOINC-Web.po locale/hr/BOINC-Web.po locale/hu/BOINC-Project-Generic.po locale/hu/BOINC-Web.po locale/it_IT/BOINC-Project-Generic.po locale/lv/BOINC-Web.po locale/nl/BOINC-Project-Generic.po locale/nl/BOINC-Web.po locale/pl/BOINC-Web.po locale/pt_BR/BOINC-Web.po locale/ro/BOINC-Web.po locale/sk/BOINC-Web.po locale/zh_TW/BOINC-Web.po Please, commit your changes or stash them before you can merge. Aborting Updating ce97e85..7dd986a Completed with errors, see above I didn't see any way to do the checkout -f in SourceTree, so I finally fixed it by manually deleting all 19 files before doing a pull, But we still have the 2 bad files in the 7.4 branch: locale/da/BOINC-Web.po locale/nl/BOINC-Project-Generic.po Please fix these. Cheers, --Charlie ___ boinc_dev mailing list boinc_dev@ssl.berkeley.edu http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
