From: "Toralf Förster" <toralf.foerster@gmx.de>
To: Andrew Ardill <andrew.ardill@gmail.com>
Cc: "git@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: problem with BOINC repository and CR/LF
Date: Mon, 17 Dec 2012 17:01:47 +0100 [thread overview]
Message-ID: <50CF41EB.1060402@gmx.de> (raw)
In-Reply-To: <CAH5451=FpmtGVVJ=mubE0KeD-tTVaNU96audzTRnNQh2BEEXPg@mail.gmail.com>
On 12/17/2012 12:38 PM, Andrew Ardill wrote:
> On 17 December 2012 21:23, Toralf Förster <toralf.foerster@gmx.de> wrote:
>> Hello,
>>
>> I'm faced with this situation :
>> http://lists.ssl.berkeley.edu/mailman/private/boinc_alpha/2012-December/017371.html
>> and even a "git stash" doesn't help.
>
> Hi Toralf,
>
> That list is private and not visible without an account. Can you
> transcribe the relevant parts?
>
> Regards,
>
> Andrew Ardill
>
Oh of course :
On 12/17/2012 12:03 AM, Gianfranco Costamagna wrote:
> So if you have further issues with boinc feel free to look in our debian
> git and feel free to download appropriate patches :-)
>
> Gianfranco
thx
Currently I'm struggling with a git problem of the boinc repository
itself and b/c I'm using git for the linux kernel tree w/o any problems
since eons /me wonders whether this is a BOINC-repository specific problem :
After doing the following sequence with git 1.8.0.2 :
$> git clone git://boinc.berkeley.edu/boinc.git
$> cd boinc
$> git checkout client_release_7.0.39
$> git checkout master
(sometimes I've to repeat this :
$> git checkout client_release_7.0.39
$> git checkout master
)
I'm faced with this situation :
$ git status
# On branch master
# 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: clientgui/AsyncRPC.cpp
# modified: clientgui/sg_BoincSimpleFrame.cpp
#
no changes added to commit (use "git add" and/or "git commit -a")
(sometimes only clientgui/sg_BoincSimpleFrame.cpp is mentioned)
Now these commands
$ git checkout -- clientgui/AsyncRPC.cpp
$ git checkout -- clientgui/sg_BoincSimpleFrame.cpp
doesn't help - the status is still the same (and ofc now I'm no longer
allowed to make a "git checkout" - due to un-commited changes).
Now I'm wondering where to start to investigate this issue ...
--
MfG/Sincerely
Toralf Förster
pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508 7DB6 9DA3
next prev parent reply other threads:[~2012-12-17 16:02 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-17 10:23 problem with BOINC repository and CR/LF Toralf Förster
2012-12-17 11:38 ` Andrew Ardill
2012-12-17 16:01 ` Toralf Förster [this message]
2012-12-18 1:56 ` Andrew Ardill
2012-12-18 9:55 ` Toralf Förster
2012-12-18 9:58 ` Toralf Förster
2012-12-18 12:15 ` Torsten Bögershausen
2012-12-18 16:41 ` Jeff King
2012-12-19 10:44 ` Toralf Förster
2012-12-22 12:31 ` Toralf Förster
2012-12-22 18:54 ` Dmitry Potapov
2012-12-22 19:17 ` Junio C Hamano
2012-12-19 10:43 ` Toralf Förster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=50CF41EB.1060402@gmx.de \
--to=toralf.foerster@gmx.de \
--cc=andrew.ardill@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).