Csound Csound-dev Csound-tekno Search About

[Cs-dev] Question on git

Date2011-04-11 13:56
FromJohn ff
Subject[Cs-dev] Question on git
On this (university) m,achine when I try to bring csound up to date
from SF (ie I run git pull) it does not update anything, but 
 git status
# On branch master
# Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.
#
# Untracked files:
#   (use "git add ..." to include in what will be committed)
#
#       TAGS
#       bug.csd
#       bug.csd~
#       build
#       test.wav
nothing added to commit but untracked files present (use "git add" to track)

How do I "fast-forward" this directory?  Never had this problem with
CVS.

==John ffitch

------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Date2011-04-11 15:28
FromSteven Yi
SubjectRe: [Cs-dev] Question on git
I'm not so familiar with this myself, but I googled and read that you
could try "git merge master".

On Mon, Apr 11, 2011 at 8:56 AM, John ff  wrote:
> On this (university) m,achine when I try to bring csound up to date
> from SF (ie I run git pull) it does not update anything, but
>  git status
> # On branch master
> # Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.
> #
> # Untracked files:
> #   (use "git add ..." to include in what will be committed)
> #
> #       TAGS
> #       bug.csd
> #       bug.csd~
> #       build
> #       test.wav
> nothing added to commit but untracked files present (use "git add" to track)
>
> How do I "fast-forward" this directory?  Never had this problem with
> CVS.
>
> ==John ffitch
>
> ------------------------------------------------------------------------------
> Xperia(TM) PLAY
> It's a major breakthrough. An authentic gaming
> smartphone on the nation's most reliable network.
> And it wants your games.
> http://p.sf.net/sfu/verizon-sfdev
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>

------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Date2011-04-11 19:03
FromJohn ff
SubjectRe: [Cs-dev] Question on git
Tries "git merge master" -- says "Already up-to-date"
==John ffitch

------------------------------------------------------------------------------
Xperia(TM) PLAY
It's a major breakthrough. An authentic gaming
smartphone on the nation's most reliable network.
And it wants your games.
http://p.sf.net/sfu/verizon-sfdev
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Date2011-04-11 19:27
FromGareth Edwards
SubjectRe: [Cs-dev] Question on git
git merge origin/master

On 11 April 2011 19:03, John ff  wrote:
> Tries "git merge master" -- says "Already up-to-date"
> ==John ffitch
>
> ------------------------------------------------------------------------------
> Xperia(TM) PLAY
> It's a major breakthrough. An authentic gaming
> smartphone on the nation's most reliable network.
> And it wants your games.
> http://p.sf.net/sfu/verizon-sfdev
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>

------------------------------------------------------------------------------
Forrester Wave Report - Recovery time is now measured in hours and minutes
not days. Key insights are discussed in the 2010 Forrester Wave Report as
part of an in-depth evaluation of disaster recovery service providers.
Forrester found the best-in-class provider in terms of services and vision.
Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Date2011-04-11 23:21
FromFelipe Sateler
SubjectRe: [Cs-dev] Question on git
What does git pull say?


On Mon, Apr 11, 2011 at 14:27, Gareth Edwards
 wrote:
> git merge origin/master
>
> On 11 April 2011 19:03, John ff  wrote:
>> Tries "git merge master" -- says "Already up-to-date"
>> ==John ffitch
>>
>> ------------------------------------------------------------------------------
>> Xperia(TM) PLAY
>> It's a major breakthrough. An authentic gaming
>> smartphone on the nation's most reliable network.
>> And it wants your games.
>> http://p.sf.net/sfu/verizon-sfdev
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>
> ------------------------------------------------------------------------------
> Forrester Wave Report - Recovery time is now measured in hours and minutes
> not days. Key insights are discussed in the 2010 Forrester Wave Report as
> part of an in-depth evaluation of disaster recovery service providers.
> Forrester found the best-in-class provider in terms of services and vision.
> Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
Forrester Wave Report - Recovery time is now measured in hours and minutes
not days. Key insights are discussed in the 2010 Forrester Wave Report as
part of an in-depth evaluation of disaster recovery service providers.
Forrester found the best-in-class provider in terms of services and vision.
Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https:/

Date2011-04-12 09:21
Fromjpff@cs.bath.ac.uk
SubjectRe: [Cs-dev] Question on git
> What does git pull say?

It d/loded some stuff but there was no indication of what it was
unlike th emanual respository which sdded/changed files
==John

>
>
> On Mon, Apr 11, 2011 at 14:27, Gareth Edwards
>  wrote:
>> git merge origin/master
>>
>> On 11 April 2011 19:03, John ff  wrote:
>>> Tries "git merge master" -- says "Already up-to-date"
>>> ==John ffitch
>>>
>>>
>



------------------------------------------------------------------------------
Forrester Wave Report - Recovery time is now measured in hours and minutes
not days. Key insights are discussed in the 2010 Forrester Wave Report as
part of an in-depth evaluation of disaster recovery service providers.
Forrester found the best-in-class provider in terms of services and vision.
Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Date2011-04-12 09:36
Fromjpff@cs.bath.ac.uk
SubjectRe: [Cs-dev] Question on git
Just tried again nd it gave me all the changes -- lots of them
 77 files changed, 1963 insertions(+), 2802 deletions(-)

Wonder why it did not yesterday?

==John ff

>> What does git pull say?
>
> It d/loded some stuff but there was no indication of what it was
> unlike th emanual respository which sdded/changed files
> ==John
>
>>
>>
>> On Mon, Apr 11, 2011 at 14:27, Gareth Edwards
>>  wrote:
>>> git merge origin/master
>>>
>>> On 11 April 2011 19:03, John ff  wrote:
>>>> Tries "git merge master" -- says "Already up-to-date"
>>>> ==John ffitch
>>>>
>>>>
>>
>
>
>
> ------------------------------------------------------------------------------
> Forrester Wave Report - Recovery time is now measured in hours and minutes
> not days. Key insights are discussed in the 2010 Forrester Wave Report as
> part of an in-depth evaluation of disaster recovery service providers.
> Forrester found the best-in-class provider in terms of services and
> vision.
> Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>
>
>



------------------------------------------------------------------------------
Forrester Wave Report - Recovery time is now measured in hours and minutes
not days. Key insights are discussed in the 2010 Forrester Wave Report as
part of an in-depth evaluation of disaster recovery service providers.
Forrester found the best-in-class provider in terms of services and vision.
Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Date2011-04-12 12:12
FromFelipe Sateler
SubjectRe: [Cs-dev] Question on git
Possibly yhe connection failed before it could fetch everything. I
have never seen this before.

On Tue, Apr 12, 2011 at 04:36,   wrote:
> Just tried again nd it gave me all the changes -- lots of them
>  77 files changed, 1963 insertions(+), 2802 deletions(-)
>
> Wonder why it did not yesterday?
>
> ==John ff
>
>>> What does git pull say?
>>
>> It d/loded some stuff but there was no indication of what it was
>> unlike th emanual respository which sdded/changed files
>> ==John
>>
>>>
>>>
>>> On Mon, Apr 11, 2011 at 14:27, Gareth Edwards
>>>  wrote:
>>>> git merge origin/master
>>>>
>>>> On 11 April 2011 19:03, John ff  wrote:
>>>>> Tries "git merge master" -- says "Already up-to-date"
>>>>> ==John ffitch
>>>>>
>>>>>
>>>
>>
>>
>>
>> ------------------------------------------------------------------------------
>> Forrester Wave Report - Recovery time is now measured in hours and minutes
>> not days. Key insights are discussed in the 2010 Forrester Wave Report as
>> part of an in-depth evaluation of disaster recovery service providers.
>> Forrester found the best-in-class provider in terms of services and
>> vision.
>> Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
>> _______________________________________________
>> Csound-devel mailing list
>> Csound-devel@lists.sourceforge.net
>> https://lists.sourceforge.net/lists/listinfo/csound-devel
>>
>>
>>
>
>
>
> ------------------------------------------------------------------------------
> Forrester Wave Report - Recovery time is now measured in hours and minutes
> not days. Key insights are discussed in the 2010 Forrester Wave Report as
> part of an in-depth evaluation of disaster recovery service providers.
> Forrester found the best-in-class provider in terms of services and vision.
> Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
> _______________________________________________
> Csound-devel mailing list
> Csound-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/csound-devel
>



-- 

Saludos,
Felipe Sateler

------------------------------------------------------------------------------
Forrester Wave Report - Recovery time is now measured in hours and minutes
not days. Key insights are discussed in the 2010 Forrester Wave Report as
part of an in-depth evaluation of disaster recovery service providers.
Forrester found the best-in-class provider in terms of services and vision.
Read this report now!  http://p.sf.net/sfu/ibm-webcastpromo
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sou