* (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
@ 2014-09-12 18:09 Toralf Förster
2014-09-12 18:19 ` [boinc_dev] " Rom Walton
0 siblings, 1 reply; 11+ messages in thread
From: Toralf Förster @ 2014-09-12 18:09 UTC (permalink / raw)
To: git-u79uwXL29TY76Z2rM5mHXA; +Cc: boinc_dev-C9EgComYM8RUAgJt6FLh2g
[-- Attachment #1: Type: text/plain, Size: 9394 bytes --]
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 will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po.
The file will have its original line endings in your working directory.
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 will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po.
The file will have its original line endings in your working directory.
Saved working directory and index state WIP on master: ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.
HEAD is now at ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.
tfoerste@n22 ~/devel/boinc-v2 $ git pull
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
Attached are my ~/.gitconfig and ~/devel/boinc-v2/.git/config
--
Toralf
pgp key: 0076 E94E
[-- Attachment #2: .gitconfig --]
[-- Type: text/plain, Size: 694 bytes --]
[user]
email = toralf.foerster@gmx.de
name = Toralf Förster
signingkey = 0076e94e
[core]
pager = less
[gui]
fontui = -family arial -size 12 -weight bold -slant roman -underline 0 -overstrike 0
fontdiff = -family Courier -size 12 -weight normal -slant roman -underline 0 -overstrike 0
[color]
diff = auto
status = auto
branch = auto
ui = auto
[sendemail]
smtpserver = mail.gmx.net
smtpencryption = tls
smtpuser = toralf.foerster@gmx.de
from = Toralf Förster <toralf.foerster@gmx.de>
assume8bitEncoding = UTF-8
confirm = never
chainreplyto = true
[diff]
#external = /home/tfoerste/workspace/bin/diffwrap.sh
[push]
default = simple
[credential]
helper = cache --timeout=1800
[-- Attachment #3: config --]
[-- Type: text/plain, Size: 262 bytes --]
[core]
repositoryformatversion = 0
filemode = true
bare = false
logallrefupdates = true
[remote "origin"]
url = git://boinc.berkeley.edu/boinc-v2.git
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
remote = origin
merge = refs/heads/master
^ permalink raw reply [flat|nested] 11+ messages in thread* RE: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
2014-09-12 18:09 (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream Toralf Förster
@ 2014-09-12 18:19 ` Rom Walton
2014-09-12 18:32 ` Toralf Förster
2014-09-14 8:51 ` [boinc_dev] " Torsten Bögershausen
0 siblings, 2 replies; 11+ messages in thread
From: Rom Walton @ 2014-09-12 18:19 UTC (permalink / raw)
To: Toralf Förster, git; +Cc: boinc_dev
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-bounces@ssl.berkeley.edu] On Behalf Of Toralf Förster
Sent: Friday, September 12, 2014 2:09 PM
To: git@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 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 will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po.
The file will have its original line endings in your working directory.
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 will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po.
The file will have its original line endings in your working directory.
Saved working directory and index state WIP on master: ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.
HEAD is now at ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.
tfoerste@n22 ~/devel/boinc-v2 $ git pull 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
Attached are my ~/.gitconfig and ~/devel/boinc-v2/.git/config
--
Toralf
pgp key: 0076 E94E
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
2014-09-12 18:19 ` [boinc_dev] " Rom Walton
@ 2014-09-12 18:32 ` Toralf Förster
2014-09-12 18:55 ` Rom Walton
2014-09-14 8:51 ` [boinc_dev] " Torsten Bögershausen
1 sibling, 1 reply; 11+ messages in thread
From: Toralf Förster @ 2014-09-12 18:32 UTC (permalink / raw)
To: Rom Walton, git; +Cc: boinc_dev
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
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
2014-09-12 18:32 ` Toralf Förster
@ 2014-09-12 18:55 ` Rom Walton
2014-09-12 19:04 ` [boinc_dev] " Toralf Förster
0 siblings, 1 reply; 11+ messages in thread
From: Rom Walton @ 2014-09-12 18:55 UTC (permalink / raw)
To: Toralf Förster, git-u79uwXL29TY76Z2rM5mHXA
Cc: boinc_dev-C9EgComYM8RUAgJt6FLh2g
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.foerster@gmx.de]
Sent: Friday, September 12, 2014 2:32 PM
To: Rom Walton; git@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.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
2014-09-12 18:55 ` Rom Walton
@ 2014-09-12 19:04 ` Toralf Förster
2014-09-12 19:10 ` Rom Walton
0 siblings, 1 reply; 11+ messages in thread
From: Toralf Förster @ 2014-09-12 19:04 UTC (permalink / raw)
To: Rom Walton, git; +Cc: boinc_dev
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
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
2014-09-12 19:04 ` [boinc_dev] " Toralf Förster
@ 2014-09-12 19:10 ` Rom Walton
[not found] ` <1BAFA9B4D550C347962F76F2E03B3BBB22C5FB-xy+Cp4waYzmnovBw3M9VzQFcV7zePqp5@public.gmane.org>
0 siblings, 1 reply; 11+ messages in thread
From: Rom Walton @ 2014-09-12 19:10 UTC (permalink / raw)
To: Toralf Förster, git-u79uwXL29TY76Z2rM5mHXA
Cc: boinc_dev-C9EgComYM8RUAgJt6FLh2g
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.foerster@gmx.de]
Sent: Friday, September 12, 2014 3:04 PM
To: Rom Walton; git@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.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [boinc_dev] (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream
2014-09-12 18:19 ` [boinc_dev] " Rom Walton
2014-09-12 18:32 ` Toralf Förster
@ 2014-09-14 8:51 ` Torsten Bögershausen
[not found] ` <54155708.7090508-S0/GAf8tV78@public.gmane.org>
1 sibling, 1 reply; 11+ messages in thread
From: Torsten Bögershausen @ 2014-09-14 8:51 UTC (permalink / raw)
To: Rom Walton, Toralf Förster, git; +Cc: boinc_dev
On 12.09.14 20:19, Rom Walton wrote:
> Try:
> git checkout -f master
> git pull origin
>
> I committed fixes for that stuff this morning.
>
> ----- Rom
It seems as if we added CRLF's to the repo:
od -c html/languages/translations/hu.po | grep "\\\r"
0577300 # # \r \n # P r i v a t e m e
I checked the latest Git, and it handles the CRLF ok.
It may be that there is a bug in the tools you are using.
Would you mind to tell us which tools and versions you used
to create commit ce97e855d0aa188757722c2 ?
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2014-09-15 21:51 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-12 18:09 (local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream Toralf Förster
2014-09-12 18:19 ` [boinc_dev] " Rom Walton
2014-09-12 18:32 ` Toralf Förster
2014-09-12 18:55 ` Rom Walton
2014-09-12 19:04 ` [boinc_dev] " Toralf Förster
2014-09-12 19:10 ` Rom Walton
[not found] ` <1BAFA9B4D550C347962F76F2E03B3BBB22C5FB-xy+Cp4waYzmnovBw3M9VzQFcV7zePqp5@public.gmane.org>
2014-09-13 14:55 ` Toralf Förster
2014-09-14 8:51 ` [boinc_dev] " Torsten Bögershausen
[not found] ` <54155708.7090508-S0/GAf8tV78@public.gmane.org>
2014-09-14 9:04 ` Toralf Förster
2014-09-14 11:23 ` [boinc_dev] " Torsten Bögershausen
2014-09-15 21:51 ` Rom Walton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.