{"thread":{"id":"37547","subject":"(local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","startedAt":"2014-09-12T18:09:26Z","lastAt":"2014-09-15T21:51:13Z","messageCount":11,"participants":["Toralf Förster","Rom Walton","Torsten Bögershausen"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"249317","messageId":"541336D6.3050803@gmx.de","threadId":"37547","inReplyTo":null,"subject":"(local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Toralf Förster","fromEmail":"toralf.foerster-mmb7mzphnfy@public.gmane.org","sentAt":"2014-09-12T18:09:26Z","receivedAt":"2014-09-12T18:09:26Z","isPatch":false,"sender":{"key":"toralf.foerster-mmb7mzphnfy@public.gmane.org","avatar":null},"body":"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:\n\n\ntfoerste@n22 ~/devel/trinity $ cd ~/devel/boinc-v2; git pull\nremote: Counting objects: 104, done.\nremote: Compressing objects: 100% (52/52), done.\nremote: Total 52 (delta 42), reused 0 (delta 0)\nUnpacking objects: 100% (52/52), done.\nFrom git://boinc.berkeley.edu/boinc-v2\n ce97e85..d2e5582 master -> origin/master\n 194f1dc..4a696b4 client_release/7/7.4 -> origin/client_release/7/7.4\nUpdating ce97e85..d2e5582\nerror: Your local changes to the following files would be overwritten by merge:\n html/languages/translations/hu.po\n html/languages/translations/nl.po\n locale/bg/BOINC-Web.po\n locale/da/BOINC-Web.po\n locale/el/BOINC-Web.po\n locale/fr/BOINC-Web.po\n locale/hr/BOINC-Web.po\n locale/hu/BOINC-Project-Generic.po\n locale/hu/BOINC-Web.po\n locale/it_IT/BOINC-Project-Generic.po\n locale/lv/BOINC-Web.po\n locale/nl/BOINC-Project-Generic.po\n locale/nl/BOINC-Web.po\n locale/pl/BOINC-Web.po\n locale/pt_BR/BOINC-Web.po\n locale/ro/BOINC-Web.po\n locale/sk/BOINC-Web.po\n locale/zh_TW/BOINC-Web.po\nPlease, commit your changes or stash them before you can merge.\nAborting\n\ntfoerste@n22 ~/devel/boinc-v2 $ git diff\n\ntfoerste@n22 ~/devel/boinc-v2 $ git status\nOn branch master\nYour branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\nChanges not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n\n modified: html/languages/translations/hu.po\n modified: html/languages/translations/nl.po\n modified: locale/bg/BOINC-Web.po\n modified: locale/da/BOINC-Web.po\n modified: locale/el/BOINC-Web.po\n modified: locale/fr/BOINC-Web.po\n modified: locale/hr/BOINC-Web.po\n modified: locale/hu/BOINC-Project-Generic.po\n modified: locale/hu/BOINC-Web.po\n modified: locale/it_IT/BOINC-Project-Generic.po\n modified: locale/lv/BOINC-Web.po\n modified: locale/nl/BOINC-Project-Generic.po\n modified: locale/nl/BOINC-Web.po\n modified: locale/pl/BOINC-Web.po\n modified: locale/pt_BR/BOINC-Web.po\n modified: locale/ro/BOINC-Web.po\n modified: locale/sk/BOINC-Web.po\n modified: locale/zh_TW/BOINC-Web.po\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n\n\ntfoerste@n22 ~/devel/boinc-v2 $ git branch \n* master\n\ntfoerste@n22 ~/devel/boinc-v2 $ git stash\nwarning: CRLF will be replaced by LF in html/languages/translations/hu.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in html/languages/translations/nl.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/bg/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/da/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/el/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/fr/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hr/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hu/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hu/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/it_IT/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/lv/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/nl/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/nl/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/pl/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/pt_BR/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in html/languages/translations/hu.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in html/languages/translations/nl.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/bg/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/da/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/el/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/fr/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hr/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hu/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hu/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/it_IT/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/lv/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/nl/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/nl/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/pl/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/pt_BR/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nSaved working directory and index state WIP on master: ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.\nHEAD is now at ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.\n\ntfoerste@n22 ~/devel/boinc-v2 $ git pull\nUpdating ce97e85..d2e5582\nerror: Your local changes to the following files would be overwritten by merge:\n html/languages/translations/hu.po\n html/languages/translations/nl.po\n locale/bg/BOINC-Web.po\n locale/da/BOINC-Web.po\n locale/el/BOINC-Web.po\n locale/fr/BOINC-Web.po\n locale/hr/BOINC-Web.po\n locale/hu/BOINC-Project-Generic.po\n locale/hu/BOINC-Web.po\n locale/it_IT/BOINC-Project-Generic.po\n locale/lv/BOINC-Web.po\n locale/nl/BOINC-Project-Generic.po\n locale/nl/BOINC-Web.po\n locale/pl/BOINC-Web.po\n locale/pt_BR/BOINC-Web.po\n locale/ro/BOINC-Web.po\n locale/sk/BOINC-Web.po\n locale/zh_TW/BOINC-Web.po\nPlease, commit your changes or stash them before you can merge.\nAborting\n\n\nAttached are my ~/.gitconfig and ~/devel/boinc-v2/.git/config\n\n-- \nToralf\npgp key: 0076 E94E\n\n\n\n[user]\n\temail = toralf.foerster@gmx.de\n\tname = Toralf Förster\n\tsigningkey = 0076e94e\n[core]\n\tpager = less\n[gui]\n\tfontui = -family arial -size 12 -weight bold -slant roman -underline 0 -overstrike 0\n\tfontdiff = -family Courier -size 12 -weight normal -slant roman -underline 0 -overstrike 0\n[color]\n\tdiff = auto\n\tstatus = auto\n\tbranch = auto\n\tui = auto\n[sendemail]\n\tsmtpserver = mail.gmx.net\n\tsmtpencryption = tls\n\tsmtpuser = toralf.foerster@gmx.de\n\tfrom = Toralf Förster \n\tassume8bitEncoding = UTF-8\n\tconfirm = never\n\tchainreplyto = true\n[diff]\n\t#external = /home/tfoerste/workspace/bin/diffwrap.sh\n[push]\n\tdefault = simple\n[credential]\n\thelper = cache --timeout=1800\n\n\n[core]\n\trepositoryformatversion = 0\n\tfilemode = true\n\tbare = false\n\tlogallrefupdates = true\n[remote \"origin\"]\n\turl = git://boinc.berkeley.edu/boinc-v2.git\n\tfetch = +refs/heads/*:refs/remotes/origin/*\n[branch \"master\"]\n\tremote = origin\n\tmerge = refs/heads/master\n\n\n"},{"id":"249319","messageId":"1BAFA9B4D550C347962F76F2E03B3BBB22C5F9@romw-mail.romwnet.org","threadId":"37547","inReplyTo":"541336D6.3050803@gmx.de","subject":"RE: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Rom Walton","fromEmail":"romw@romwnet.org","sentAt":"2014-09-12T18:19:36Z","receivedAt":"2014-09-12T18:19:36Z","isPatch":false,"sender":{"key":"romw@romwnet.org","avatar":null},"body":"Try:\ngit checkout -f master\ngit pull origin\n\nI committed fixes for that stuff this morning.\n\n----- Rom\n\n-----Original Message-----\nFrom: boinc_dev [mailto:boinc_dev-bounces@ssl.berkeley.edu] On Behalf Of Toralf Förster\nSent: Friday, September 12, 2014 2:09 PM\nTo: git@vger.kernel.org\nCc: boinc_dev@ssl.berkeley.edu\nSubject: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream\n\nToday 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:\n\n\ntfoerste@n22 ~/devel/trinity $ cd ~/devel/boinc-v2; git pull\nremote: Counting objects: 104, done.\nremote: Compressing objects: 100% (52/52), done.\nremote: Total 52 (delta 42), reused 0 (delta 0) Unpacking objects: 100% (52/52), done.\nFrom git://boinc.berkeley.edu/boinc-v2\n ce97e85..d2e5582 master -> origin/master\n 194f1dc..4a696b4 client_release/7/7.4 -> origin/client_release/7/7.4 Updating ce97e85..d2e5582\nerror: Your local changes to the following files would be overwritten by merge:\n html/languages/translations/hu.po\n html/languages/translations/nl.po\n locale/bg/BOINC-Web.po\n locale/da/BOINC-Web.po\n locale/el/BOINC-Web.po\n locale/fr/BOINC-Web.po\n locale/hr/BOINC-Web.po\n locale/hu/BOINC-Project-Generic.po\n locale/hu/BOINC-Web.po\n locale/it_IT/BOINC-Project-Generic.po\n locale/lv/BOINC-Web.po\n locale/nl/BOINC-Project-Generic.po\n locale/nl/BOINC-Web.po\n locale/pl/BOINC-Web.po\n locale/pt_BR/BOINC-Web.po\n locale/ro/BOINC-Web.po\n locale/sk/BOINC-Web.po\n locale/zh_TW/BOINC-Web.po\nPlease, commit your changes or stash them before you can merge.\nAborting\n\ntfoerste@n22 ~/devel/boinc-v2 $ git diff\n\ntfoerste@n22 ~/devel/boinc-v2 $ git status On branch master Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch) Changes not staged for commit:\n (use \"git add ...\" to update what will be committed)\n (use \"git checkout -- ...\" to discard changes in working directory)\n\n modified: html/languages/translations/hu.po\n modified: html/languages/translations/nl.po\n modified: locale/bg/BOINC-Web.po\n modified: locale/da/BOINC-Web.po\n modified: locale/el/BOINC-Web.po\n modified: locale/fr/BOINC-Web.po\n modified: locale/hr/BOINC-Web.po\n modified: locale/hu/BOINC-Project-Generic.po\n modified: locale/hu/BOINC-Web.po\n modified: locale/it_IT/BOINC-Project-Generic.po\n modified: locale/lv/BOINC-Web.po\n modified: locale/nl/BOINC-Project-Generic.po\n modified: locale/nl/BOINC-Web.po\n modified: locale/pl/BOINC-Web.po\n modified: locale/pt_BR/BOINC-Web.po\n modified: locale/ro/BOINC-Web.po\n modified: locale/sk/BOINC-Web.po\n modified: locale/zh_TW/BOINC-Web.po\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n\n\ntfoerste@n22 ~/devel/boinc-v2 $ git branch\n* master\n\ntfoerste@n22 ~/devel/boinc-v2 $ git stash\nwarning: CRLF will be replaced by LF in html/languages/translations/hu.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in html/languages/translations/nl.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/bg/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/da/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/el/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/fr/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hr/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hu/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hu/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/it_IT/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/lv/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/nl/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/nl/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/pl/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/pt_BR/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in html/languages/translations/hu.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in html/languages/translations/nl.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/bg/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/da/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/el/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/fr/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hr/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hu/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/hu/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/it_IT/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/lv/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/nl/BOINC-Project-Generic.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/nl/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/pl/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/pt_BR/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po.\nThe file will have its original line endings in your working directory.\nSaved working directory and index state WIP on master: ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.\nHEAD is now at ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.\n\ntfoerste@n22 ~/devel/boinc-v2 $ git pull Updating ce97e85..d2e5582\nerror: Your local changes to the following files would be overwritten by merge:\n html/languages/translations/hu.po\n html/languages/translations/nl.po\n locale/bg/BOINC-Web.po\n locale/da/BOINC-Web.po\n locale/el/BOINC-Web.po\n locale/fr/BOINC-Web.po\n locale/hr/BOINC-Web.po\n locale/hu/BOINC-Project-Generic.po\n locale/hu/BOINC-Web.po\n locale/it_IT/BOINC-Project-Generic.po\n locale/lv/BOINC-Web.po\n locale/nl/BOINC-Project-Generic.po\n locale/nl/BOINC-Web.po\n locale/pl/BOINC-Web.po\n locale/pt_BR/BOINC-Web.po\n locale/ro/BOINC-Web.po\n locale/sk/BOINC-Web.po\n locale/zh_TW/BOINC-Web.po\nPlease, commit your changes or stash them before you can merge.\nAborting\n\n\nAttached are my ~/.gitconfig and ~/devel/boinc-v2/.git/config\n\n--\nToralf\npgp key: 0076 E94E\n\n"},{"id":"249320","messageId":"54133C3A.4080700@gmx.de","threadId":"37547","inReplyTo":"1BAFA9B4D550C347962F76F2E03B3BBB22C5F9@romw-mail.romwnet.org","subject":"Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Toralf Förster","fromEmail":"toralf.foerster@gmx.de","sentAt":"2014-09-12T18:32:26Z","receivedAt":"2014-09-12T18:32:26Z","isPatch":false,"sender":{"key":"toralf.foerster@gmx.de","avatar":null},"body":"On 09/12/2014 08:19 PM, Rom Walton wrote:\n> Try:\n> git checkout -f master\n> git pull origin\n> \n> I committed fixes for that stuff this morning.\n\ndoesn't helped :\n\ntfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master\nAlready on 'master'\nYour branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\ntfoerste@n22 ~/devel/boinc-v2 $ git pull origin\nUpdating ce97e85..d2e5582\nerror: Your local changes to the following files would be overwritten by merge:\n html/languages/translations/hu.po\n html/languages/translations/nl.po\n locale/bg/BOINC-Web.po\n locale/da/BOINC-Web.po\n locale/el/BOINC-Web.po\n locale/fr/BOINC-Web.po\n locale/hr/BOINC-Web.po\n locale/hu/BOINC-Project-Generic.po\n locale/hu/BOINC-Web.po\n locale/it_IT/BOINC-Project-Generic.po\n locale/lv/BOINC-Web.po\n locale/nl/BOINC-Project-Generic.po\n locale/nl/BOINC-Web.po\n locale/pl/BOINC-Web.po\n locale/pt_BR/BOINC-Web.po\n locale/ro/BOINC-Web.po\n locale/sk/BOINC-Web.po\n locale/zh_TW/BOINC-Web.po\nPlease, commit your changes or stash them before you can merge.\nAborting\n\n-- \nToralf\npgp key: 0076 E94E\n"},{"id":"249321","messageId":"1BAFA9B4D550C347962F76F2E03B3BBB22C5FA@romw-mail.romwnet.org","threadId":"37547","inReplyTo":"54133C3A.4080700@gmx.de","subject":"Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Rom Walton","fromEmail":"romw-egxtziwxyp1afugrpc6u6w@public.gmane.org","sentAt":"2014-09-12T18:55:20Z","receivedAt":"2014-09-12T18:55:20Z","isPatch":false,"sender":{"key":"romw-egxtziwxyp1afugrpc6u6w@public.gmane.org","avatar":null},"body":"Crud...\n\nWell, personally, I would delete the locale directory and the two translation files in html.\n\nDo the 'git pull', and then switch between master and some other branch.\n\nlike:\ngit checkout -f client_release/7/7.4\ngit checkout -f master\n\nIt is round about, but it should get the job done.\n\n----- Rom\n\n-----Original Message-----\nFrom: Toralf Förster [mailto:toralf.foerster@gmx.de] \nSent: Friday, September 12, 2014 2:32 PM\nTo: Rom Walton; git@vger.kernel.org\nCc: boinc_dev@ssl.berkeley.edu\nSubject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream\n\nOn 09/12/2014 08:19 PM, Rom Walton wrote:\n> Try:\n> git checkout -f master\n> git pull origin\n> \n> I committed fixes for that stuff this morning.\n\ndoesn't helped :\n\ntfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master Already on 'master'\nYour branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\ntfoerste@n22 ~/devel/boinc-v2 $ git pull origin Updating ce97e85..d2e5582\nerror: Your local changes to the following files would be overwritten by merge:\n html/languages/translations/hu.po\n html/languages/translations/nl.po\n locale/bg/BOINC-Web.po\n locale/da/BOINC-Web.po\n locale/el/BOINC-Web.po\n locale/fr/BOINC-Web.po\n locale/hr/BOINC-Web.po\n locale/hu/BOINC-Project-Generic.po\n locale/hu/BOINC-Web.po\n locale/it_IT/BOINC-Project-Generic.po\n locale/lv/BOINC-Web.po\n locale/nl/BOINC-Project-Generic.po\n locale/nl/BOINC-Web.po\n locale/pl/BOINC-Web.po\n locale/pt_BR/BOINC-Web.po\n locale/ro/BOINC-Web.po\n locale/sk/BOINC-Web.po\n locale/zh_TW/BOINC-Web.po\nPlease, commit your changes or stash them before you can merge.\nAborting\n\n--\nToralf\npgp key: 0076 E94E\n\n_______________________________________________\nboinc_dev mailing list\nboinc_dev@ssl.berkeley.edu\nhttp://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev\nTo unsubscribe, visit the above URL and\n(near bottom of page) enter your email address."},{"id":"249323","messageId":"541343BC.1050503@gmx.de","threadId":"37547","inReplyTo":"1BAFA9B4D550C347962F76F2E03B3BBB22C5FA@romw-mail.romwnet.org","subject":"Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Toralf Förster","fromEmail":"toralf.foerster@gmx.de","sentAt":"2014-09-12T19:04:28Z","receivedAt":"2014-09-12T19:04:28Z","isPatch":false,"sender":{"key":"toralf.foerster@gmx.de","avatar":null},"body":"On 09/12/2014 08:55 PM, Rom Walton wrote:\n> Crud...\n> \n> Well, personally, I would delete the locale directory and the two translation files in html.\n> \n> Do the 'git pull', and then switch between master and some other branch.\n> \n> like:\n> git checkout -f client_release/7/7.4\n> git checkout -f master\n> \n> It is round about, but it should get the job done.\n\nRe-cloning seems to be the only way, b/c :\n\ntfoerste@n22 ~/devel/boinc-v2 $ git checkout -f client_release/7/7.4\nBranch client_release/7/7.4 set up to track remote branch client_release/7/7.4 from origin.\nSwitched to a new branch 'client_release/7/7.4'\n\ntfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master\nChecking out files: 100% (234/234), done.\nSwitched to branch 'master'\nYour branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\ntfoerste@n22 ~/devel/boinc-v2 $ git pull\nUpdating ce97e85..d2e5582\nerror: Your local changes to the following files would be overwritten by merge:\n...\n\n\n-- \nToralf\npgp key: 0076 E94E\n"},{"id":"249326","messageId":"1BAFA9B4D550C347962F76F2E03B3BBB22C5FB@romw-mail.romwnet.org","threadId":"37547","inReplyTo":"541343BC.1050503@gmx.de","subject":"Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Rom Walton","fromEmail":"romw-egxtziwxyp1afugrpc6u6w@public.gmane.org","sentAt":"2014-09-12T19:10:06Z","receivedAt":"2014-09-12T19:10:06Z","isPatch":false,"sender":{"key":"romw-egxtziwxyp1afugrpc6u6w@public.gmane.org","avatar":null},"body":"I found this:\nhttp://stackoverflow.com/questions/17223527/how-do-i-force-git-to-checkout-the-master-branch-and-remove-carriage-returns-aft\n\nThat might help in the future.\n\n----- Rom\n\n-----Original Message-----\nFrom: Toralf Förster [mailto:toralf.foerster@gmx.de] \nSent: Friday, September 12, 2014 3:04 PM\nTo: Rom Walton; git@vger.kernel.org\nCc: boinc_dev@ssl.berkeley.edu\nSubject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream\n\nOn 09/12/2014 08:55 PM, Rom Walton wrote:\n> Crud...\n> \n> Well, personally, I would delete the locale directory and the two translation files in html.\n> \n> Do the 'git pull', and then switch between master and some other branch.\n> \n> like:\n> git checkout -f client_release/7/7.4\n> git checkout -f master\n> \n> It is round about, but it should get the job done.\n\nRe-cloning seems to be the only way, b/c :\n\ntfoerste@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.\nSwitched to a new branch 'client_release/7/7.4'\n\ntfoerste@n22 ~/devel/boinc-v2 $ git checkout -f master Checking out files: 100% (234/234), done.\nSwitched to branch 'master'\nYour branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.\n (use \"git pull\" to update your local branch)\n\ntfoerste@n22 ~/devel/boinc-v2 $ git pull Updating ce97e85..d2e5582\nerror: Your local changes to the following files would be overwritten by merge:\n...\n\n\n--\nToralf\npgp key: 0076 E94E\n\n_______________________________________________\nboinc_dev mailing list\nboinc_dev@ssl.berkeley.edu\nhttp://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev\nTo unsubscribe, visit the above URL and\n(near bottom of page) enter your email address."},{"id":"249349","messageId":"54145AF7.4090606@gmx.de","threadId":"37547","inReplyTo":"1BAFA9B4D550C347962F76F2E03B3BBB22C5FB-xy+Cp4waYzmnovBw3M9VzQFcV7zePqp5@public.gmane.org","subject":"Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Toralf Förster","fromEmail":"toralf.foerster-mmb7mzphnfy@public.gmane.org","sentAt":"2014-09-13T14:55:51Z","receivedAt":"2014-09-13T14:55:51Z","isPatch":false,"sender":{"key":"toralf.foerster-mmb7mzphnfy@public.gmane.org","avatar":null},"body":"On 09/12/2014 09:10 PM, Rom Walton wrote:\n> I found this:\n> http://stackoverflow.com/questions/17223527/how-do-i-force-git-to-checkout-the-master-branch-and-remove-carriage-returns-aft\n> \n> That might help in the future.\n\nThis helped :\n\ngit reset --hard 9e860d0451\ngit pull\ngit clean -f\ngit gc\ngit prune\n\n\n-- \nToralf\npgp key: 0076 E94E\n"},{"id":"249392","messageId":"54155708.7090508@web.de","threadId":"37547","inReplyTo":"1BAFA9B4D550C347962F76F2E03B3BBB22C5F9@romw-mail.romwnet.org","subject":"Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2014-09-14T08:51:20Z","receivedAt":"2014-09-14T08:51:20Z","isPatch":false,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"On 12.09.14 20:19, Rom Walton wrote:\n> Try:\n> git checkout -f master\n> git pull origin\n> \n> I committed fixes for that stuff this morning.\n> \n> ----- Rom\nIt seems as if we added CRLF's to the repo:\n\nod -c html/languages/translations/hu.po | grep \"\\\\\\r\"\n0577300 # # \\r \\n # P r i v a t e m e\n\nI checked the latest Git, and it handles the CRLF ok.\n\nIt may be that there is a bug in the tools you are using.\nWould you mind to tell us which tools and versions you used\nto create commit ce97e855d0aa188757722c2 ?\n"},{"id":"249394","messageId":"54155A1D.8040504@gmx.de","threadId":"37547","inReplyTo":"54155708.7090508-S0/GAf8tV78@public.gmane.org","subject":"Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Toralf Förster","fromEmail":"toralf.foerster-mmb7mzphnfy@public.gmane.org","sentAt":"2014-09-14T09:04:29Z","receivedAt":"2014-09-14T09:04:29Z","isPatch":false,"sender":{"key":"toralf.foerster-mmb7mzphnfy@public.gmane.org","avatar":null},"body":"On 09/14/2014 10:51 AM, Torsten Bögershausen wrote:\n> It may be that there is a bug in the tools you are using.\nI use git 2.1.0\n\n-- \nToralf\npgp key: 0076 E94E\n\n_______________________________________________\nboinc_dev mailing list\nboinc_dev@ssl.berkeley.edu\nhttp://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev\nTo unsubscribe, visit the above URL and\n(near bottom of page) enter your email address."},{"id":"249397","messageId":"54157AA6.7000801@web.de","threadId":"37547","inReplyTo":"54155A1D.8040504@gmx.de","subject":"Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Torsten Bögershausen","fromEmail":"tboegi@web.de","sentAt":"2014-09-14T11:23:18Z","receivedAt":"2014-09-14T11:23:18Z","isPatch":false,"sender":{"key":"tboegi@web.de","avatar":"https://avatars.githubusercontent.com/u/7138363?v=4"},"body":"On 09/14/2014 10:51 AM, Torsten Bögershausen wrote:\n>> It may be that there is a bug in the tools you are using.\n> I use git 2.1.0\n>\nThe question was how the commit had been produced:\nRom, what are you using ?\n"},{"id":"249462","messageId":"1BAFA9B4D550C347962F76F2E03B3BBB22C5FE@romw-mail.romwnet.org","threadId":"37547","inReplyTo":"54157AA6.7000801@web.de","subject":"Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream","fromName":"Rom Walton","fromEmail":"romw-egxtziwxyp1afugrpc6u6w@public.gmane.org","sentAt":"2014-09-15T21:51:13Z","receivedAt":"2014-09-15T21:51:13Z","isPatch":false,"sender":{"key":"romw-egxtziwxyp1afugrpc6u6w@public.gmane.org","avatar":null},"body":"Our server runs an older version of git.\n\n1.7.1\n\nWe are in the process of migrating to a new server which runs a more up-to-date distro.\n\n----- Rom\n\n-----Original Message-----\nFrom: Torsten Bögershausen [mailto:tboegi@web.de] \nSent: Sunday, September 14, 2014 7:23 AM\nTo: Toralf Förster; Torsten Bögershausen; Rom Walton; git@vger.kernel.org\nCc: boinc_dev@ssl.berkeley.edu\nSubject: Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream\n\nOn 09/14/2014 10:51 AM, Torsten Bögershausen wrote:\n>> It may be that there is a bug in the tools you are using.\n> I use git 2.1.0\n>\nThe question was how the commit had been produced:\nRom, what are you using ?\n\n\n\n_______________________________________________\nboinc_dev mailing list\nboinc_dev@ssl.berkeley.edu\nhttp://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev\nTo unsubscribe, visit the above URL and\n(near bottom of page) enter your email address."}]}